Merge pull request #9612 from Expensify/Rory-FixCallableWorkflow

Expensify · Jun 28, 2022 · 715f715 · 715f715
2 parents 7da6439 + 25da7ee
commit 715f715
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/.github/workflows/preDeploy.yml b/.github/workflows/preDeploy.yml
@@ -14,14 +14,14 @@ jobs:
   confirmPassingBuild:
     runs-on: ubuntu-latest
     needs: [lint, test]
-    if: ${{ always() && (needs.lint.result == 'failure' || needs.test.result == 'failure') }}
+    if: ${{ always() }}
 
     steps:
       # This Slack step is duplicated in all workflows, if you make a change to this step, make sure to update all
       # the other workflows with the same change
       - uses: 8398a7/action-slack@v3
         name: Job failed Slack notification
-        if: ${{ failure() }}
+        if: ${{ needs.lint.result == 'failure' || needs.test.result == 'failure' }}
         with:
           status: custom
           fields: workflow, repo
@@ -38,6 +38,9 @@ jobs:
           GITHUB_TOKEN: ${{ github.token }}
           SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
 
+      - if: ${{ needs.lint.result == 'failure' || needs.test.result == 'failure' }}
+        run: exit 1
+
   chooseDeployActions:
     runs-on: ubuntu-latest
     needs: confirmPassingBuild