From 2fdf9b57537d1a0d2c3864b9be9ff544f53dfcd5 Mon Sep 17 00:00:00 2001 From: Richard Abrich Date: Thu, 3 Sep 2026 20:03:15 -0400 Subject: [PATCH] ci: don't let a push cancel a release-qualification dispatch The concurrency group keyed on workflow and ref only, so an ordinary push to main cancelled the workflow_dispatch run the release gate reads. That matrix takes about 50 minutes and merges to main land every 30, so qualifying main was a race the release could not win: 1.35.0 has now lost it twice, once at 50 minutes. Including github.event_name separates the two. Pushes still cancel pushes, and a second dispatch still cancels the first. Co-Authored-By: Claude Opus 5 --- .github/workflows/ci.yml | 8 +++++++- public-artifacts.json | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 67b3a25f..a707c923 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -60,8 +60,14 @@ on: # Cancel any superseded in-flight run for the same ref (e.g. a force-push or a # rapid second push to a PR branch) instead of letting both run to completion. +# +# The group includes the event, so a release-qualification `workflow_dispatch` +# run is not cancelled by an ordinary push to the same ref. The release gate +# requires the latest exact-SHA dispatched run to conclude `success`, and this +# matrix takes about 50 minutes while merges to `main` land every 30, so a +# shared group made qualifying `main` a race the release could not win. concurrency: - group: ci-${{ github.workflow }}-${{ github.ref }} + group: ci-${{ github.workflow }}-${{ github.event_name }}-${{ github.ref }} cancel-in-progress: true # GitHub Actions are pinned to full commit SHAs (not mutable tags) as a diff --git a/public-artifacts.json b/public-artifacts.json index e5f7b650..834b8c42 100644 --- a/public-artifacts.json +++ b/public-artifacts.json @@ -93,7 +93,7 @@ }, { "path": ".github/workflows/ci.yml", - "sha256": "f48bbee282d3ef293c81af185e2827fcf440ff4719dfc9f91a17d344c49c3108" + "sha256": "46976c2a8daa9a936a4db9f64b72719f4618ac3e29ae02d3cc8035dd61c4b356" }, { "path": ".github/workflows/citrix-workspace-standin.yml",