ci: build master changes through a merge queue - #1560
Open
joaodinissf wants to merge 1 commit into
Open
joaodinissf wants to merge 1 commit into
joaodinissf wants to merge 1 commit into
Conversation
Run the verify checks on merge_group so master can be gated by a merge queue that builds one PR at a time on top of the current master. Merge-queue and snapshot builds keep replacing artifacts with the published snapshot's, but now fail when a version the snapshot already has comes with different content (-Dtycho.baseline=failCommon) instead of silently swapping in the published copy. Two merges within one minute gave the runtime feature one version for two contents; the snapshot build then took #1551's feature, which pins xtext.ui 17.3.3, and failed to resolve the umbrella feature. PR builds no longer replace anything with the published snapshot, so a bad or newer snapshot cannot fail an unrelated PR; the queue build checks the PR against master. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
joaodinissf
enabled auto-merge (rebase)
September 30, 2026 10:41
joaodinissf
disabled auto-merge
September 30, 2026 10:52
This branch has not been deployed
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.
Why the change
Master should only ever move to a commit that was built exactly as the snapshot build will build it, so two PRs that are green on their own can no longer break master together or share a version.
Special things to note
masterruleset, with rebase merges, one PR per group, one group building at a time, all-green grouping and a 60-minute check timeout. Adding it first would leave queued PRs waiting for checks that never run.-Dtycho.baseline=failCommonfails the build when an artifact has a version the published snapshot already has, with different content. Tycho's default only warns and swaps in the published copy. On 28 Sep, fix(xtext): match case-sensitive pattern lookups against the candidate name #1551 and fix(xtext.ui): iterate a snapshot of the matches when showing a running search #1552 were merged 9 s apart, so the runtime feature got one version for two contents. The snapshot build swapped in fix(xtext): match case-sensitive pattern lookups against the candidate name #1551's feature, which pinsxtext.ui17.3.3, and failed to resolve. The last good snapshot swapped 36 artifacts, all identical, so the guard has no false positives there. Because the queue builds one PR at a time and each takes a full CI run, two merges can no longer land in the same minute.-Dtycho.baseline=disable -Dtycho.baseline.replace=none). A PR build only has to show that the PR is correct; the queue checks it against master. Today one bad snapshot fails every open PR, and so does a PR whose commits are older than master's last change to the same feature. The release version check (compare-version-with-baselines) is unchanged.Change outline
🤖 Generated with Claude Code