From ab21e145eb08dee308281f1e8e5203023789d006 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <andy.wilkinson@broadcom.com>
Date: Fri, 2 May 2025 15:06:37 +0100
Subject: [PATCH] Stop sending notification on expected failure

The changes in 752729f1 in advertently resulted in notifications
being sent upon an expected failure. This commit corrects that by
looking at the build step's conclusion (where continue-on-error has
been taken into account) rather than build step's outcome (where
continue-on-error has not been considered).
---
 .github/workflows/smoke-test.yml                            | 6 +++---
 .../src/main/resources/smoke-test.yml                       | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/smoke-test.yml b/.github/workflows/smoke-test.yml
index 0d3d8f5c..d226200f 100644
--- a/.github/workflows/smoke-test.yml
+++ b/.github/workflows/smoke-test.yml
@@ -68,13 +68,13 @@ jobs:
         continue-on-error: ${{ inputs.expected_to_fail }}
       - name: Check out send notification action
         uses: actions/checkout@v4
-        if: ${{ steps.build.outcome == 'failure' || (steps.build.outcome == 'success' && inputs.expected_to_fail)}}
+        if: ${{ steps.build.conclusion == 'failure' || (steps.build.outcome == 'success' && inputs.expected_to_fail)}}
         with:
           path: ci
           ref: ci
           sparse-checkout: .github/actions/send-notification
       - name: Determine owner ID secret names
-        if: ${{ steps.build.outcome == 'failure' || (steps.build.outcome == 'success' && inputs.expected_to_fail)}}
+        if: ${{ steps.build.conclusion == 'failure' || (steps.build.outcome == 'success' && inputs.expected_to_fail)}}
         run: |
           projectName=$(echo ${{ inputs.project }} | tr '[:lower:]:-' '[:upper:]__')
           groupName=$(echo $projectName | awk '{print substr($1, 0, index($1, "_") - 1)}')
@@ -88,7 +88,7 @@ jobs:
           path: '**/build/**/hs_err_pid*.log'
       - name: Send notification
         uses: ./ci/.github/actions/send-notification
-        if: ${{ steps.build.outcome == 'failure' || (steps.build.outcome == 'success' && inputs.expected_to_fail)}}
+        if: ${{ steps.build.conclusion == 'failure' || (steps.build.outcome == 'success' && inputs.expected_to_fail)}}
         with:
           webhook-url: ${{ secrets.GOOGLE_CHAT_WEBHOOK_URL }}
           task: ${{ inputs.project }}:${{ inputs.task }}
diff --git a/gradle/plugins/aot-smoke-test-ci-plugin/src/main/resources/smoke-test.yml b/gradle/plugins/aot-smoke-test-ci-plugin/src/main/resources/smoke-test.yml
index 0d3d8f5c..d226200f 100644
--- a/gradle/plugins/aot-smoke-test-ci-plugin/src/main/resources/smoke-test.yml
+++ b/gradle/plugins/aot-smoke-test-ci-plugin/src/main/resources/smoke-test.yml
@@ -68,13 +68,13 @@ jobs:
         continue-on-error: ${{ inputs.expected_to_fail }}
       - name: Check out send notification action
         uses: actions/checkout@v4
-        if: ${{ steps.build.outcome == 'failure' || (steps.build.outcome == 'success' && inputs.expected_to_fail)}}
+        if: ${{ steps.build.conclusion == 'failure' || (steps.build.outcome == 'success' && inputs.expected_to_fail)}}
         with:
           path: ci
           ref: ci
           sparse-checkout: .github/actions/send-notification
       - name: Determine owner ID secret names
-        if: ${{ steps.build.outcome == 'failure' || (steps.build.outcome == 'success' && inputs.expected_to_fail)}}
+        if: ${{ steps.build.conclusion == 'failure' || (steps.build.outcome == 'success' && inputs.expected_to_fail)}}
         run: |
           projectName=$(echo ${{ inputs.project }} | tr '[:lower:]:-' '[:upper:]__')
           groupName=$(echo $projectName | awk '{print substr($1, 0, index($1, "_") - 1)}')
@@ -88,7 +88,7 @@ jobs:
           path: '**/build/**/hs_err_pid*.log'
       - name: Send notification
         uses: ./ci/.github/actions/send-notification
-        if: ${{ steps.build.outcome == 'failure' || (steps.build.outcome == 'success' && inputs.expected_to_fail)}}
+        if: ${{ steps.build.conclusion == 'failure' || (steps.build.outcome == 'success' && inputs.expected_to_fail)}}
         with:
           webhook-url: ${{ secrets.GOOGLE_CHAT_WEBHOOK_URL }}
           task: ${{ inputs.project }}:${{ inputs.task }}