Update push-event.yml

.github/workflows/push-event.yml

@@ -30,7 +30,6 @@ jobs:
           node-version: "12.x"
 
         # Install all dependencies
-      - run: cd frontend
       - run: npm install
       - run: pwd    
       # This triggers `gatsby build` script in "package.json"
@@ -42,7 +41,7 @@ jobs:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           netlify-auth-token: ${{ secrets.NETLIFY_AUTH_TOKEN }}
           netlify-site-id: ${{ secrets.NETLIFY_SITE_ID }}
-          build-dir: 'frontend/build'
+          build-dir: './build'
           draft: true
           comment-on-pull-request: true
 
@@ -64,44 +63,18 @@ jobs:
           node-version: "12.x"
 
         # Install all dependencies
-      - run: cd ./frontend && npm install
-      - run: cd ./frontend && pwd
+      - run: npm install
+      - run: pwd
       # This triggers `gatsby build` script in "package.json"
 #       - run: cd ./frontend && npm install --save
-      - run: cd ./frontend && npm run build
+      - run: npm run build
 
       - name: Deploy draft to Netlify on push
         uses: South-Paw/[email protected]
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           netlify-auth-token: ${{ secrets.NETLIFY_AUTH_TOKEN }}
           netlify-site-id: ${{ secrets.NETLIFY_SITE_ID }}
-          build-dir: '.frontend/build'
-          draft: true
-          comment-on-commit: true
-
-#       - name: Checkout repository
-#         uses: actions/checkout@v1
-
-#       # Build steps for gatsby build
-#       - name: Setup Node
-#         uses: actions/setup-node@v1
-#         with:
-#           node-version: "12.x"
-
-        # Install all dependencies
-        #- run: cd frontend
-      - run: npm install
-      - run: pwd
-      # This triggers `gatsby build` script in "package.json"
-      - run: npm start
-
-      - name: Deploy draft to Netlify on push
-        uses: South-Paw/[email protected]
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          netlify-auth-token: ${{ secrets.NETLIFY_AUTH_TOKEN_1 }}
-          netlify-site-id: ${{ secrets.NETLIFY_SITE_ID_1 }}
           build-dir: './build'
           draft: true
           comment-on-commit: true
@@ -118,29 +91,6 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v1
 
-      # Build steps for gatsby build
-      - name: Setup Node
-        uses: actions/setup-node@v1
-        with:
-          node-version: "12.x"
-
-        # Install all dependencies
-      - run: cd ./frontend && npm install
-      - run: cd ./frontend && pwd
-      # This triggers `gatsby build` script in "package.json"
-      - run: cd ./frontend && npm run build
-
-      - name: Deploy production to Netlify
-        uses: South-Paw/[email protected]
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          netlify-auth-token: ${{ secrets.NETLIFY_AUTH_TOKEN }}
-          netlify-site-id: ${{ secrets.NETLIFY_SITE_ID }}
-          build-dir: '.frontend/build'
-
-      - name: Checkout repository
-        uses: actions/checkout@v1
-
       # Build steps for gatsby build
       - name: Setup Node
         uses: actions/setup-node@v1
@@ -151,12 +101,13 @@ jobs:
       - run: npm install
       - run: pwd
       # This triggers `gatsby build` script in "package.json"
-      - run: npm start
+      - run: npm run build
 
       - name: Deploy production to Netlify
         uses: South-Paw/[email protected]
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
-          netlify-auth-token: ${{ secrets.NETLIFY_AUTH_TOKEN_1 }}
-          netlify-site-id: ${{ secrets.NETLIFY_SITE_ID_1 }}
+          netlify-auth-token: ${{ secrets.NETLIFY_AUTH_TOKEN }}
+          netlify-site-id: ${{ secrets.NETLIFY_SITE_ID }}
           build-dir: './build'
+