Repository navigation
ci: run every PR workflow in the merge queue - #4354
Merged
Merged
Conversation
GitHub ignores paths filters for merge_group events. Each path-filtered workflow now applies its own pull_request paths to the queued change (scripts/ci/merge_queue.py scope), CI's change detection compares the queue commit with its base, and the new Merge queue check waits for every workflow that declares merge_group and fails as soon as one fails.
Contributor
|
The latest updates on your projects. Learn more about Vercel for GitHub. 1 Skipped Deployment
|
|
Sandchest reviewed Sandchest reviews every change for vulnerabilities an attacker could use · Review details |
Member
Author
|
hey @greptileai, please re-review the PR |
Member
Author
|
hey @greptileai, please re-review the PR |
# Conflicts: # .github/workflows/ci.yml
Member
Author
|
hey @greptileai, please re-review the PR |
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.

Problem
engine-verify.ymlruns onmerge_group, and GitHub ignorespathsfilters formerge_group. Turning the queue on now would hang every entry onVerify recording, and nothing else would gate.Change
flowchart LR PR[PR checks green] --> Q[enqueue] Q --> G["queue commit: main + PRs ahead + this PR"] G --> W["every workflow with merge_group<br/>scope = its own pull_request paths<br/>applied to base_sha..head_sha"] W --> M{"Merge queue check<br/>waits for all of them"} M -->|all green| L[lands on main] M -->|any red| X[removed from queue]merge_group(21 workflows;engine-verify.ymlalready did). The only exception is the label-triggeredengine-verify-label.yml.Scopejob that only runs in the queue. It reads the workflow's ownon.pull_request.pathsand applies them to the queued change, so the queue runs exactly what the PR ran, from one source of truth. On pull requests the job is skipped and the heavy jobs run as before:glass-probe,instant-reliability,linux-desktop-reliability,picker-smoke) take the queue decision in that job.perf-budgetandverify-recordingfeed the queue diff into their existingplan.py risk/plan.py recordinglogic, treating the queued PR as ready (never a draft).ci.ymlpointsdorny/paths-filteratmerge_group.base_sha..head_sha, so the same filters pick the same jobs.Merge queuecheck (.github/workflows/merge-queue.yml): in the queue it lists the workflows that declaremerge_groupat the queued commit, waits for each run on that commit, and fails as soon as one fails. A workflow added to the queue later gates without a ruleset change. On pull requests it only runs the helper self-test.scripts/ci/merge_queue.py: GitHub's filter glob syntax (*,**,**/, negation), a dependency-free reader foron:cross-checked against PyYAML on every workflow, NUL-separatedgit diff --no-renames(renames count both paths), and the gate loop. If the diff cannot be computed, scope runs in full.docker-build-media-servertreatsmerge_grouplike a PR (no GHCR push) andverify-recordingskips its cache save. Concurrency groups key on the queue ref (gh-readonly-queue/main/pr-N-<sha>), unique per entry, so nothing cancels a queue run except the queue itself.Coverage
For 20 recently merged PRs, the jobs that ran on the PR head compared with what the queue runs for the same changed files under this change (
scripts/ci/merge_queue.pyplus the CI filters and theplan.pyscopes). Any PR-head job whose workflow would not run in the queue counts as missing. Withsync-tests.ymltaken out of the queue set as a control, the same comparison reports 18 missing jobs across 4 PRs.Queue behaviour
A temporary
queue-proofbranch (main plus this change) with a ruleset requiringEngine verify,Verify recordingandMerge queue: merge commits, ALLGREEN, up to 5 groups building.crates/utils(CI Rust + GPUI builds, Engine verify FULL, Verify recording, Linux desktop suite)crates/api(only Clippy builds it, so the PR's required checks were green)canary_value, B adds a call to it; each green alone, merge cleanly, both queued A then BE0425 cannot find function canary_valueapps/webonlyapps/webrecording contract, with every desktop job skippedgh pr merge --adminwith the queue rule on and no bypass actorsChanges must be made through the merge queueAt least 1 approving review is required by reviewers with write access); the proof branch passed with 0 required approvals.

Confidence Score: 5/5
The PR appears safe to merge; no blocking issues were found.Summary
Extends pull-request checks to the merge queue and adds a gate that waits for every queue workflow.
No new actionable issues found. The earlier Unicode filename issue is fixed. The helper self-test passed; PyYAML was unavailable, so the YAML cross-check did not run.
Reviews (8) · Last reviewed commit: "Merge remote-tracking branch 'origin/mai..." · Reviewed by Greptile