Update steps

96boards · Oct 6, 2023 · a532e61 · a532e61
1 parent 930d413
commit a532e61
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 30 deletions.
diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml
@@ -4,14 +4,19 @@ on:
   pull_request_target:
     branches: [ main, master, develop ]
 
+# Cancel in-progress jobs or runs for the current workflow
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   process-pull-request:
     runs-on: self-hosted
     steps:
-      - name: Cancel previous runs
-        uses: n1hility/cancel-previous-runs@v2
-        with: 
-          token: ${{ secrets.GITHUB_TOKEN }}
+      # - name: Cancel previous runs
+      #   uses: n1hility/cancel-previous-runs@v2
+      #   with: 
+      #     token: ${{ secrets.GITHUB_TOKEN }}
 
       # HACK! 96Boards is currently using an old Jekyll theme that caches
       # built images inside the source directory which gets reset when the
@@ -23,7 +28,7 @@ jobs:
         run: MS="$GITHUB_WORKSPACE/website/merged_sources"; if [ -d "$MS" ]; then mv "$MS" "$GITHUB_WORKSPACE"; fi
 
       - name: Fetch website repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
           path: website
@@ -33,7 +38,7 @@ jobs:
         run: MS="$GITHUB_WORKSPACE/merged_sources"; if [ -d "$MS" ]; then mv "$MS" "$GITHUB_WORKSPACE/website"; fi
 
       - name: Fetch docs repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
           repository: 96boards/documentation
@@ -68,10 +73,10 @@ jobs:
       - name: Check routing rules
         run: /srv/github-action-scripts/test-routing-rules.sh
 
-      - name: Run Pa11y scan
-        uses: benc-uk/workflow-dispatch@v1
-        with:
-          workflow: CheckSite
-          repo: linaro-its/pa11y-ci-container
-          token: ${{ secrets.BUILD_REPO_TOKEN }}
-          inputs: '{ "uri": "${{ env.SITE_URL }}" }'
+      # - name: Run Pa11y scan
+      #   uses: benc-uk/workflow-dispatch@v1
+      #   with:
+      #     workflow: CheckSite
+      #     repo: linaro-its/pa11y-ci-container
+      #     token: ${{ secrets.BUILD_REPO_TOKEN }}
+      #     inputs: '{ "uri": "${{ env.SITE_URL }}" }'
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -5,14 +5,19 @@ on:
     branches: [ main, master, develop ]
   workflow_dispatch:
 
+# Cancel in-progress jobs or runs for the current workflow
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   process-push:
     runs-on: self-hosted
     steps:
-      - name: Cancel previous runs
-        uses: n1hility/cancel-previous-runs@v2
-        with: 
-          token: ${{ secrets.GITHUB_TOKEN }}
+      # - name: Cancel previous runs
+      #   uses: n1hility/cancel-previous-runs@v2
+      #   with: 
+      #     token: ${{ secrets.GITHUB_TOKEN }}
 
       # HACK! 96Boards is currently using an old Jekyll theme that caches
       # built images inside the source directory which gets reset when the
@@ -24,7 +29,7 @@ jobs:
         run: MS="$GITHUB_WORKSPACE/website/merged_sources"; if [ -d "$MS" ]; then mv "$MS" "$GITHUB_WORKSPACE"; fi
 
       - name: Fetch website repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           path: website
 
@@ -33,7 +38,7 @@ jobs:
         run: MS="$GITHUB_WORKSPACE/merged_sources"; if [ -d "$MS" ]; then mv "$MS" "$GITHUB_WORKSPACE/website"; fi
 
       - name: Fetch docs repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: 96boards/documentation
           path: documentation
@@ -44,7 +49,7 @@ jobs:
       - run: env
 
       - name: Directory push/pop
-        uses: linaro-its/directory-push-and-pop@v2.4
+        uses: linaro-its/directory-push-and-pop@v3.0
         with:
           cacheDirectory: /srv/site-builds
           namedDirectory: ${{ env.SITE_URL }}
@@ -57,14 +62,21 @@ jobs:
 
       - run: cat $GITHUB_EVENT_PATH
 
+      # - name: Check links
+      #   run: >-
+      #     /srv/github-action-scripts/check-links.sh
+      #     ${{ github.workspace }}/website/${{ env.SITE_URL }}
+      #     --skip-dns-check ${{ github.workspace }}/website/_data/fqdn_exceptions.txt
+      #     --create-github-issue https://api.github.com/repos/96boards/website/issues
+      #     --assign-github-issue '["ric96", "Yang-96Boards"]'
+      #     --github-access-token ${{ secrets.GITHUB_TOKEN }}
+
       - name: Check links
         run: >-
           /srv/github-action-scripts/check-links.sh
           ${{ github.workspace }}/website/${{ env.SITE_URL }}
           --skip-dns-check ${{ github.workspace }}/website/_data/fqdn_exceptions.txt
-          --create-github-issue https://api.github.com/repos/96boards/website/issues
-          --assign-github-issue '["ric96", "Yang-96Boards"]'
-          --github-access-token ${{ secrets.GITHUB_TOKEN }}
+          --no-external-errors
 
       - name: Check routing rules
         run: /srv/github-action-scripts/test-routing-rules.sh
@@ -87,10 +99,10 @@ jobs:
       - name: Invalidate CloudFront cache
         run: /srv/github-action-scripts/invalidate-cloudfront.sh
 
-      - name: Run Pa11y scan
-        uses: benc-uk/workflow-dispatch@v1
-        with:
-          workflow: CheckSite
-          repo: linaro-its/pa11y-ci-container
-          token: ${{ secrets.BUILD_REPO_TOKEN }}
-          inputs: '{ "uri": "${{ env.SITE_URL }}" }'
+      # - name: Run Pa11y scan
+      #   uses: benc-uk/workflow-dispatch@v1
+      #   with:
+      #     workflow: CheckSite
+      #     repo: linaro-its/pa11y-ci-container
+      #     token: ${{ secrets.BUILD_REPO_TOKEN }}
+      #     inputs: '{ "uri": "${{ env.SITE_URL }}" }'