CI - Fix the merge queue #3571
Merged
CI - Fix the merge queue #3571
+8
−16
Conversation
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
bfops
commented
Nov 5, 2025
cloutiertyler
approved these changes
Nov 5, 2025
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
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.
Description of Changes
The merge queue was (partly) getting borked because we were putting all non-PR CI events into the same concurrency group, which meant they all non-PR CI jobs would run sequentially instead of running in parallel. This sometimes caused painfully long delays in the merge queue.
This was due to my misunderstanding in #3501 (comment), where I didn't realize that
cancel-in-progress: falsewould cause everything to queue up.Now, for non-PR events, we append the commit SHA to the concurrency group. For merge queue events, this should be the SHA of the ephemeral merge commit that GH creates, so it will never conflict. For push events or manual workflow dispatch events, the SHA should be a sane way to recognize/cancel redundant events.
API and ABI breaking changes
None. CI-only change.
Expected complexity level and risk
1
Testing
Unfortunately it's hard to test the behavior for non-PR events without merging and seeing if it works.