From eea71708ac53bdb6230c16d8564daec71263d6e5 Mon Sep 17 00:00:00 2001 From: Peter Steinberger Date: Wed, 20 May 2026 01:16:32 +0100 Subject: [PATCH] test(release): update workflow concurrency expectations --- test/scripts/package-acceptance-workflow.test.ts | 2 +- test/scripts/plugin-prerelease-test-plan.test.ts | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/test/scripts/package-acceptance-workflow.test.ts b/test/scripts/package-acceptance-workflow.test.ts index e3b78479e94..fa4b49bbe71 100644 --- a/test/scripts/package-acceptance-workflow.test.ts +++ b/test/scripts/package-acceptance-workflow.test.ts @@ -763,7 +763,7 @@ describe("package artifact reuse", () => { '-f rerun_group="$child_rerun_group"', 'args+=(-f live_suite_filter="$LIVE_SUITE_FILTER")', 'args+=(-f cross_os_suite_filter="$CROSS_OS_SUITE_FILTER")', - "cancel-in-progress: ${{ inputs.ref == 'main' && inputs.rerun_group == 'all' }}", + "cancel-in-progress: ${{ (inputs.ref == 'main' && inputs.rerun_group == 'all') || startsWith(inputs.ref, 'tideclaw/alpha/') }}", "gh run cancel", "NORMAL_CI_RESULT: ${{ needs.normal_ci.result }}", ]); diff --git a/test/scripts/plugin-prerelease-test-plan.test.ts b/test/scripts/plugin-prerelease-test-plan.test.ts index 62678b4a702..1278e9613a7 100644 --- a/test/scripts/plugin-prerelease-test-plan.test.ts +++ b/test/scripts/plugin-prerelease-test-plan.test.ts @@ -469,11 +469,12 @@ describe("scripts/lib/plugin-prerelease-test-plan.mjs", () => { expect(releaseChecksWorkflow.concurrency).toEqual({ group: "openclaw-release-checks-${{ inputs.expected_sha || inputs.ref }}-${{ inputs.rerun_group }}", - "cancel-in-progress": false, + "cancel-in-progress": "${{ startsWith(github.ref, 'refs/heads/tideclaw/alpha/') }}", }); expect(fullReleaseWorkflow.concurrency).toEqual({ group: "full-release-validation-${{ inputs.ref }}-${{ inputs.rerun_group }}", - "cancel-in-progress": "${{ inputs.ref == 'main' && inputs.rerun_group == 'all' }}", + "cancel-in-progress": + "${{ (inputs.ref == 'main' && inputs.rerun_group == 'all') || startsWith(inputs.ref, 'tideclaw/alpha/') }}", }); expect(releaseChecksWorkflow.jobs.resolve_target["runs-on"]).toBe("ubuntu-24.04"); expect(releaseChecksWorkflow.jobs.prepare_release_package["runs-on"]).toBe("ubuntu-24.04");