ci: use actions-gh-pages [skip ci]

researchdata-sheffield · Mar 24, 2022 · 2ccf254 · 2ccf254
1 parent b145e47
commit 2ccf254
Show file tree

Hide file tree

Showing 6 changed files with 152 additions and 205 deletions.
diff --git a/.github/workflows/deploy-qa.yml b/.github/workflows/deploy-qa.yml
@@ -15,12 +15,12 @@ on:
         default: ''  
 
 jobs:
-  Deploy-to-QA:
+  Deploy-QA:
     runs-on: windows-2019
     defaults:
       run:
         shell: bash
-    if: ${{ github.event.workflow_run.conclusion == 'success' }}
+    if: ${{ github.event_name == 'workflow_dispatch' || github.event.workflow_run.conclusion == 'success' }}
 
     steps:
       - name: Cancel Previous Runs
@@ -33,8 +33,8 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ~/.npm
-          key: ${{ runner.os }}-npm-cache-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: ${{ runner.os }}-npm-cache-
+          key: ${{ runner.os }}-npm-cache-v4-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: ${{ runner.os }}-npm-cache-v4-
 
       - name: Gatsby QA Cache
         id: gatsby-qa-cache
@@ -43,20 +43,21 @@ jobs:
           path: |
             public
             .cache
-          key: ${{ runner.os }}-gatsby-qa-${{ github.run_id }}
-          restore-keys: ${{ runner.os }}-gatsby-qa-
+          key: ${{ runner.os }}-gatsby-v4-qa-${{ github.run_id }}
+          restore-keys: ${{ runner.os }}-gatsby-v4-qa-
 
       - name: Install dependencies
         run: npm ci
-      
+
       - name: Set user info
         run: |
-          git config --local user.email "support+actions@github.com"
-          git config --local user.name "github-actions-bot"
-        
-      - name: Deploy to QA
-        run: npm run deploy:qa
-
+          git config --local user.name 'github-actions[bot]'
+          git config --local user.email 'github-actions[bot]@users.noreply.github.com'
+      
+      - name: Build 
+        run: |
+          npm run build:qa
+          rm -f public/CNAME
         env:
           NODE_OPTIONS: '--max_old_space_size=4096'
           EVENT_API_KEY_1: ${{ secrets.EVENT_API_KEY_1 }}
@@ -67,5 +68,13 @@ jobs:
           GATSBY_GH_APP_GITALK_SECRET: ${{ secrets.GATSBY_GH_APP_GITALK_SECRET }}
           GH_TOKEN: ${{ secrets.GH_TOKEN }}
           GATSBY_ENV: ${{ secrets.GATSBY_ENV }}
-
 
+      - name: Deploy
+        uses: peaceiris/actions-gh-pages@v3
+        with:
+          personal_token: ${{ secrets.GH_TOKEN }}
+          external_repository: researchdata-sheffield/dataviz-hub2-qa 
+          publish_branch: main
+          publish_dir: ./public
+          user_name: 'github-actions[bot]'
+          user_email: 'github-actions[bot]@users.noreply.github.com'
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -70,7 +70,9 @@ jobs:
           GIT_COMMITTER_EMAIL: "support+actions@github.com"
 
       - name: Deploy
-        run: npm run deploy
+        run: |
+          git remote set-url origin https://git:${GH_TOKEN}@github.com/researchdata-sheffield/dataviz-hub2.git
+          npm run deploy
         env:
           NODE_OPTIONS: '--max_old_space_size=4096'
           EVENT_API_KEY_1: ${{ secrets.EVENT_API_KEY_1 }}

diff --git a/gatsby-config.js b/gatsby-config.js
@@ -436,20 +436,6 @@ module.exports = {
     },
     /*********** END RSS Feed ************* */
     `gatsby-plugin-sass`,
-    {
-      resolve: `gatsby-plugin-purgecss`,
-      options: {
-        printRejected: true,
-        develop: true,
-        tailwind: true,
-        purgeOnly: [
-          "src/components/",
-          "src/pages/",
-          "src/templates/",
-          "content/"
-        ]
-      }
-    },
     {
       resolve: "gatsby-plugin-webpack-bundle-analyser-v2",
       options: {