CI: run on merge_group (prerequisite for the merge queue)#16
Merged
Conversation
Prerequisite for enabling a merge queue on main. The queue builds each PR against the exact main it will land on and gates it on the required checks; those checks must trigger on the merge_group event or the queue hangs forever waiting for a status that never reports. Adds the merge_group trigger and excludes queue runs from concurrency cancellation (each entry must complete to merge). Also drops a stale 'both host OSes' comment left from the reverted macOS matrix. Must land in main BEFORE the queue is enabled. Assisted-by: Claude:claude-fable-5
The job-header comment still claimed zizmor uploads SARIF to Code Scanning, contradicting the advanced-security: false config below it (Code Scanning is not enabled on this repo). Landed via #13; corrected here alongside the merge_group change to the same file. Assisted-by: Claude:claude-fable-5
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
1 participant
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.
Step 1 of 2 for enabling a merge queue on main (your choice B).
This adds the
merge_grouptrigger toci.ymlso thecheck/gitleaks/zizmorjobs run on each entry the queue builds. This must be in main before the queue is turned on — a queue whose required checks don't trigger onmerge_grouphangs forever waiting for a status that never reports (the same never-reports trap we hit with the renamedcheckcontext).Also excludes merge-queue runs from concurrency cancellation (each entry must complete to merge) and drops a stale 'both host OSes' comment left from the reverted macOS matrix.
Step 2 (after this merges) — I'll do these and verify:
mainwith amerge_queuerule (required checks =check,gitleaks,zizmor; merge method = squash or as you prefer).strict("require up to date") from the classic protection — the queue supersedes it, and keeping both is redundant churn.zizmor clean;
merge_grouptrigger and all three required jobs present.Assisted-by: Claude:claude-fable-5