From 0e2c6889c6c196da20c90f6ee1d45dc2fad58a8e Mon Sep 17 00:00:00 2001 From: Kevin Backhouse Date: Thu, 4 Dec 2025 15:47:52 +0000 Subject: [PATCH 1/5] Using two separate jobs didn't work well. Using "exit 1" to abort instead. --- .github/workflows/smoketest.yaml | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/.github/workflows/smoketest.yaml b/.github/workflows/smoketest.yaml index 82b55b1..f489a95 100644 --- a/.github/workflows/smoketest.yaml +++ b/.github/workflows/smoketest.yaml @@ -14,14 +14,12 @@ permissions: statuses: read # Required for checking if all commit statuses are "success" in order to deploy the PR jobs: - permission-check: + Linux: runs-on: ubuntu-latest environment: smoketest if: github.event.issue.pull_request # Make sure the comment is on a PR - outputs: - allowed: ${{ steps.branch-deploy.outputs.continue }} steps: - - name: branch-deploy + - name: Branch Deploy id: branch-deploy uses: github/branch-deploy@48285b12b35e47e2dde0c27d2abb33daa846d98b # v11.0.0 with: @@ -31,12 +29,16 @@ jobs: stable_branch: "main" update_branch: "disabled" - run-tests: - runs-on: ubuntu-latest - environment: smoketest - needs: permission-check - if: needs.permission-check.outputs.allowed == 'true' - steps: + - name: Check branch-deploy result + env: + BRANCH_DEPLOY_RESULT: ${{ steps.branch-deploy.outputs.continue }} + run: | + # Make the job stop with an error if branch-deploy didn't return "true". + if [ "$BRANCH_DEPLOY_RESULT" != "true" ] ; then + echo "Branch Deploy didn't return true. Aborting the job." + exit 1 + fi + - name: Setup Python uses: actions/setup-python@v5 with: From c42b011163f2837cfd1369eff47876fb0a8f0084 Mon Sep 17 00:00:00 2001 From: Kevin Backhouse Date: Thu, 4 Dec 2025 15:56:39 +0000 Subject: [PATCH 2/5] Update .github/workflows/smoketest.yaml Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- .github/workflows/smoketest.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/smoketest.yaml b/.github/workflows/smoketest.yaml index f489a95..5293754 100644 --- a/.github/workflows/smoketest.yaml +++ b/.github/workflows/smoketest.yaml @@ -34,6 +34,7 @@ jobs: BRANCH_DEPLOY_RESULT: ${{ steps.branch-deploy.outputs.continue }} run: | # Make the job stop with an error if branch-deploy didn't return "true". + echo "Branch deploy result: $BRANCH_DEPLOY_RESULT" if [ "$BRANCH_DEPLOY_RESULT" != "true" ] ; then echo "Branch Deploy didn't return true. Aborting the job." exit 1 From 6d17d1fd468b6b8addc4d494edd565c7cc91a908 Mon Sep 17 00:00:00 2001 From: Kevin Backhouse Date: Thu, 4 Dec 2025 16:04:47 +0000 Subject: [PATCH 3/5] Update .github/workflows/smoketest.yaml Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- .github/workflows/smoketest.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/smoketest.yaml b/.github/workflows/smoketest.yaml index 5293754..da9dc3f 100644 --- a/.github/workflows/smoketest.yaml +++ b/.github/workflows/smoketest.yaml @@ -34,7 +34,7 @@ jobs: BRANCH_DEPLOY_RESULT: ${{ steps.branch-deploy.outputs.continue }} run: | # Make the job stop with an error if branch-deploy didn't return "true". - echo "Branch deploy result: $BRANCH_DEPLOY_RESULT" + echo "Branch Deploy result: $BRANCH_DEPLOY_RESULT" if [ "$BRANCH_DEPLOY_RESULT" != "true" ] ; then echo "Branch Deploy didn't return true. Aborting the job." exit 1 From 2d7b903905147ddc08c7cd9c51d5806640865ebc Mon Sep 17 00:00:00 2001 From: Kevin Backhouse Date: Thu, 4 Dec 2025 16:05:08 +0000 Subject: [PATCH 4/5] Update .github/workflows/smoketest.yaml Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- .github/workflows/smoketest.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/smoketest.yaml b/.github/workflows/smoketest.yaml index da9dc3f..69b8e50 100644 --- a/.github/workflows/smoketest.yaml +++ b/.github/workflows/smoketest.yaml @@ -33,7 +33,7 @@ jobs: env: BRANCH_DEPLOY_RESULT: ${{ steps.branch-deploy.outputs.continue }} run: | - # Make the job stop with an error if branch-deploy didn't return "true". + # Stop the job with an error if branch-deploy didn't return "true". echo "Branch Deploy result: $BRANCH_DEPLOY_RESULT" if [ "$BRANCH_DEPLOY_RESULT" != "true" ] ; then echo "Branch Deploy didn't return true. Aborting the job." From e7b007f20fd545c7eb9fa0d3969d9da3d528ffd3 Mon Sep 17 00:00:00 2001 From: Kevin Backhouse Date: Thu, 4 Dec 2025 17:11:28 +0000 Subject: [PATCH 5/5] Update .github/workflows/smoketest.yaml Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- .github/workflows/smoketest.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/smoketest.yaml b/.github/workflows/smoketest.yaml index 69b8e50..a4434da 100644 --- a/.github/workflows/smoketest.yaml +++ b/.github/workflows/smoketest.yaml @@ -29,7 +29,7 @@ jobs: stable_branch: "main" update_branch: "disabled" - - name: Check branch-deploy result + - name: Check Branch Deploy result env: BRANCH_DEPLOY_RESULT: ${{ steps.branch-deploy.outputs.continue }} run: |