fix(ci): merge on failure (#2074)

bcgov · Sep 4, 2024 · 7a79ead · 7a79ead
1 parent 486f4b7
commit 7a79ead
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml
@@ -83,7 +83,9 @@ jobs:
   results:
     name: Analysis Results
     needs: [tests, trivy]
+    if: always()
     runs-on: ubuntu-22.04
     steps:
+      - if: contains(needs.*.result, 'failure')
+        run: echo "At least one job has failed." && exit 1
       - run: echo "Success!"
-
diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml
@@ -50,7 +50,9 @@ jobs:
   results:
     name: PR Results
     needs: [builds, deploys, tests]
-    if: always() && (!failure()) && (!cancelled())
+    if: always()
     runs-on: ubuntu-22.04
     steps:
+      - if: contains(needs.*.result, 'failure')
+        run: echo "At least one job has failed." && exit 1
       - run: echo "Success!"