Repository navigation
Refresh approved PRs in parallel instead of building batch PRs - #1998
Merged
Merged
Conversation
The merge train picked one PR per run, and any up-to-date PR with CI running made every other green PR wait for it. #1988/#1989 worked around that by merging several PRs into a separate batch PR and testing that, which is not how the queue should behave. Remove the batch lane entirely. The train now only ever merges latest into approved PR branches, in two lanes: - normal: up to MERGE_TRAIN_DEPTH (default 3) PRs refreshed and testing at once; an in-flight PR never blocks the rest; earliest green goes first, with the existing aging rule and one-time retry of old failures. - migration: any PR touching src/*/migrations/ (renames and truncated or unreadable diffs included) is refreshed one at a time in approval order. latest stays strict, so a stale green result still cannot merge and two migration PRs cannot both land without the second retesting. Batch-only guards in CodeQL, Docker, owner-auto-merge and migration-order are reverted; the migration-number checks from #1988 stay. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
dannyvfilms
enabled auto-merge
November 15, 2026 02:18
Codex Review Summary: ✅ CompletedThis comment shows the latest Codex review activity on this pull request.
ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings. |
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.
Replaces the batch-PR approach from #1988/#1989. The train no longer opens PRs or creates branches. It only merges
latestinto approved PR branches, and GitHub's native auto-merge lands whichever up-to-date PR goes green first.The old stall
choose()picked one PR per run, and any up-to-date PR with CI running ("in flight") made every other PR wait. That's why green PRs like #1982 and #1970 sat idle behind #1986.Now
MERGE_TRAIN_DEPTH(repo variable, default 3;1= old serial train) migration-free PRs are refreshed and testing at once. A PR in flight never blocks the others. Free slots go to the earliest green first, then by approval order. The 2-hour aging rule and the one-time retry of old failures are kept.src/*/migrations/goes here, including renames in or out, diffs of 300+ files, and diffs the API couldn't return. These are refreshed one at a time in approval order and must passmigration-orderagainst thelatestthey merge into.lateststays strict and the three required checks are unchanged. When one PR merges, the others are behind again and get refreshed, so a stale green result can't merge and two clashing migration PRs can't both land.MERGE_TRAIN_BATCH. Also reverted the batch-only guards in CodeQL, Docker,owner-auto-mergeandmigration-order. The migration-number checks from Merge green migration-free PRs in cumulative batches; block new duplicate migration numbers #1988 stay.Tradeoff
With strict on, at most one PR merges per full CI run. This removes idle time but doesn't raise that ceiling. Of the PRs tested together, only the first to go green merges, and the others rerun. That's up to
depth - 1discarded runs per merge.Verification
python3 -m unittest config.tests.test_merge_train config.tests.test_migration_order(fromsrc/): 61 tests OK. These cover parallel refresh beside an in-flight PR, the Show detail rating and watched taps at once, and fix Android light mode #1986/Count an episode play as a watch only when it is finished #1982/Fix episode page 500 from person links with an empty source #1970 case, depth cap, earliest green first, aging, migration FIFO plus fail-closed detection, fork 403 handoff, and a check that the only writes areupdate-branchcalls plus the retry marker.ruff checkis clean on the changed files.After merging
merge-train/batch-*branch. The new train ignores it because it has no auto-merge.MERGE_TRAIN_BATCHrepo variable; it's unused now.🤖 Generated with Claude Code