Merge branch 'develop' of https://github.com/PalisadoesFoundation/tal…

…awa-admin into setup-script
PalisadoesFoundation · Jan 20, 2024 · cb73e16 · cb73e16
2 parents 31cda90 + 45920a7
commit cb73e16
Show file tree

Hide file tree

Showing 6 changed files with 3,549 additions and 11,272 deletions.
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -63,6 +63,11 @@ jobs:
       - name: Checkout the Repository
         uses: actions/checkout@v3
 
+      - name: Node.js Version
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+
       - name: Restore node_modules from cache
         id: cache-npm
         uses: actions/cache@v3
@@ -136,6 +141,7 @@ jobs:
           path: talawa-admin-docs
 
   Copy-docs-to-talawa-docs:
+    needs: Generate-Documentation
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3

diff --git a/.gitignore b/.gitignore
@@ -31,4 +31,7 @@ yarn-error.log*
 # express setup
 debug.log
 
-.vscode
+# No editor related files
+.idea
+.vscode
+*.swp