[ci] use !cancelled() as run condition

This can help workflow automatically exit without forcing cancellation. Signed-off-by: Avimitin <[email protected]>
chipsalliance · Jan 21, 2024 · 9f2d668 · 9f2d668
1 parent 2fcbebb
commit 9f2d668
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/postpr.yml b/.github/workflows/postpr.yml
@@ -47,7 +47,7 @@ jobs:
           nix shell '.#ammonite' -c .github/scripts/ci.sc convertPerfToMD
 
       - uses: actions/upload-artifact@v4
-        if: always()
+        if: !cancelled()
         with:
           name: test-results-${{ matrix.id }}
           path: |
@@ -56,14 +56,14 @@ jobs:
             perf-result-*.md
 
       - uses: actions/upload-artifact@v4
-        if: always()
+        if: !cancelled()
         with:
           name: nix-post-build-hook-log-${{ matrix.id }}
           path: /tmp/nix-post-build-hook.log
 
   report:
     name: "Report CI result"
-    if: always() && github.event.pull_request.merged == true
+    if: !cancelled() && github.event.pull_request.merged == true
     needs: [run-testcases]
     runs-on: [self-hosted, linux, nixos]
     steps:

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -95,7 +95,7 @@ jobs:
             --resultDir test-results-$(head -c 10 /dev/urandom | base32)
 
       - uses: actions/upload-artifact@v4
-        if: always()
+        if: !cancelled()
         with:
           name: test-reports-${{ matrix.id }}
           path: |
@@ -110,15 +110,15 @@ jobs:
           path: test-results-*/failed-logs
 
       - uses: actions/upload-artifact@v4
-        if: always()
+        if: !cancelled()
         with:
           name: nix-post-build-hook-log-${{ matrix.id }}
           path: /tmp/nix-post-build-hook.log
 
 
   gen-fail-wave-matrix:
     name: "Generate matrix for re-testing failing tests"
-    if: always()
+    if: !cancelled()
     needs: [run-testcases]
     runs-on: [self-hosted, linux, nixos]
     outputs:
@@ -147,7 +147,7 @@ jobs:
   build-fail-wave:
     name: "Generate wave for failing tests"
     needs: [build-emulators, gen-fail-wave-matrix]
-    if: ${{ always() && needs.gen-fail-wave-matrix.outputs.generate_wave == 'true'  }}
+    if: ${{ !cancelled() && needs.gen-fail-wave-matrix.outputs.generate_wave == 'true'  }}
     strategy:
       fail-fast: false
       matrix: ${{ fromJSON(needs.gen-fail-wave-matrix.outputs.retry_tasks) }}
@@ -179,7 +179,7 @@ jobs:
 
   report:
     name: "Report CI result"
-    if: always()
+    if: ${{ !cancelled() }}
     needs: [run-testcases]
     runs-on: [self-hosted, linux, nixos]
     steps: