Fail if main or pre jobs are cancelled (#2493)

haskell · Dec 17, 2021 · eee4c63 · eee4c63
1 parent 0211f75
commit eee4c63
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml
@@ -203,6 +203,5 @@ jobs:
           echo "jobs info: ${{ toJSON(needs) }}"
       - if: contains(needs.*.result, 'failure')
         run: exit 1
-      - if: contains(needs.*.result, 'cancelled')
-        name: cancelling
-        uses: andymckay/cancel-action@0.2
+      - if: contains(needs.*.result, 'cancelled') && needs.pre_job.outputs.should_skip != 'true'
+        run: exit 1
diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml
@@ -114,6 +114,5 @@ jobs:
           echo "jobs info: ${{ toJSON(needs) }}"
       - if: contains(needs.*.result, 'failure')
         run: exit 1
-      - if: contains(needs.*.result, 'cancelled')
-        name: cancelling
-        uses: andymckay/cancel-action@0.2
+      - if: contains(needs.*.result, 'cancelled') && needs.pre_job.outputs.should_skip != 'true'
+        run: exit 1
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -261,6 +261,5 @@ jobs:
           echo "jobs info: ${{ toJSON(needs) }}"
       - if: contains(needs.*.result, 'failure')
         run: exit 1
-      - if: contains(needs.*.result, 'cancelled')
-        name: cancelling
-        uses: andymckay/cancel-action@0.2
+      - if: contains(needs.*.result, 'cancelled') && needs.pre_job.outputs.should_skip != 'true'
+        run: exit 1