ci: support merge queues#1124
Draft
chaptersix wants to merge 2 commits into
Draft
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
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.
Summary
cliextGo modules remain tidyui-server/v2 v2.50.1checksums exposed by the initial tidy runWhy
GitHub merge queues test synthetic
merge_groupcommits. Required workflows that only listen forpull_requestdo not create checks for those commits, leaving queued pull requests blocked until timeout.The server-version job also used
github.base_ref, which is populated for pull requests but not merge groups. Explicitly accepting themerge_groupevent ensures the validation actually runs on the queued commit.The tidy check provides additional protection for dependency updates that merge without a textual conflict but leave module metadata inconsistent.
Validation
actionlint .github/workflows/ci.yaml .github/workflows/govulncheck.ymlgo mod tidywith a clean diff in the root modulego mod tidywith a clean diff incliextgo test ./...chaptersix-org/temporal-cli: GitHub created agh-readonly-queue/main/...ref, triggered both workflows, ran Validate Server Version, and merged the test PR through the queueSandbox evidence:
Administrator follow-up
After this lands on
main, repository administrators can enable the merge-queue rule and select the intended required checks. Organization-managed checks such as CODEOWNERS, Opengrep, and CLA should be confirmed to support merge-group commits before they are made queue requirements.