Stop cancelling superseded runs on main - #7201
Merged
Merged
Conversation
|
The docs for this PR live here. All of your documentation changes will be reflected on that endpoint. The docs are available until 30 days after the last update. |
Member
Author
|
Merging this PR as a CI hotfix. |
30 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What does this PR do?
#7172 grouped push runs by
github.refso that a newer merge cancels the run started by the previous one. It saves the runner time it claimed, but it makesmainlook broken: I thought it was going to be grey instead of red.GitHub rolls a commit's checks up into the single icon shown in the commit list, and it buckets
cancelledwith failure. The three most recent merges before this PR:The first two are red for nothing. The third is a real failure, and it is now indistinguishable from the noise. Since #7172 merged, 3 of the 8 commits on
maincarry a red rollup and 2 of them only because their runs were cancelled. A history where most commits show a failing icon teaches everyone to stop reading the icon, which costs more than the runner time the change saved.There is no way to recolour it. Only
success,skippedandneutralavoid red; a workflow job cannot reportneutralfor itself, and a job-levelif:is evaluated when the job is scheduled, which is before we can know that a later commit is coming.This restores
github.run_idas the fallback, so every push gets its own group again. Cancellation of superseded pull request runs, the larger half of #7170 and the part that was not in question, is unchanged. The!cancelled()guard added to the Slack steps in #7172 stays and simply becomes inert.Applied to
tests-experimental.ymlas well so the two blocks stay identical.Removing redundant
mainruns without attaching cancelled checks to commits needs a mechanism that tests batches before they land rather than after, which is what the GitHub merge queue does. That is a bigger change and a separate conversation.Part of #7169.
Note
Low Risk
CI workflow-only change; restores per-push runs on main without altering test logic or PR cancel-in-progress behavior.
Overview
Reverts the non-PR GitHub Actions concurrency key from
github.refback togithub.run_idintests.ymlandtests-experimental.yml, with the same one-line change in both workflows.On
mainpushes, each run now gets its own concurrency group again, so a newer merge no longer cancels the previous push’s jobs. That avoids cancelled workflows rolling up as red/failed on the commit list when nothing actually broke. Pull request behaviour is unchanged: the group still usesgithub.event.pull_request.number, so superseded PR runs can still be cancelled viacancel-in-progress: true.Reviewed by Cursor Bugbot for commit fc63991. Bugbot is set up for automated code reviews on this repo. Configure here.