feat(ci): auto forward-port v5 merge-train PRs to next - #24848
Merged
Conversation
This was referenced Jul 21, 2026
Closed
Closed
Closed
Closed
Closed
alexghr
approved these changes
Jul 22, 2026
| # shellcheck disable=SC2254 | ||
| case "$f" in $g) matched=1; break ;; esac | ||
| done | ||
| [[ $matched -eq 0 ]] && { ALL_EXCLUDED=0; break; } |
Contributor
There was a problem hiding this comment.
ok so this looks for at least one file that needs to be ported.
## Problem `next` was cut from a reshaped snapshot of `v5-next`, so the daily whole-branch merge (`port-v5-next-to-next.yml`) fights ~300 byte-level false conflicts against `next`'s reshaped history and never converges. Genuinely-new v5 work is a small, recent set, but it drowns in that noise. ## Change Replace the whole-branch merge with per-PR forward-porting, reusing the existing `port-to-next` → `backport.yml` → `port-to-next-staging` pipeline: - **`auto-port-v5-merge-trains.yml`** (new): on open, label every PR into a `merge-train/*-v5` branch with `port-to-next`, so `backport.yml` cherry-picks it individually when it merges. Opt out by removing the label before merge. - **`backport_to_staging.sh`**: skip empty cherry-picks (change already in `next` — e.g. a next→release backport bounced back) instead of reporting a false conflict; and when the target is `next`, skip release-line artifacts (release bumps, per-release upgrade/deploy scripts, regenerated fixtures, v5-merge plumbing). - **`port-v5-next-to-next.yml`**: disable the superseded daily schedule; keep `workflow_dispatch` as a manual drift-check. Individual-PR granularity keeps each conflict small (one PR against `next`, resolved by the existing ClaudeBox path) instead of one unreviewable 300-file blob. New release lines need their train pattern added to the labeler (e.g. `merge-train/*-v6`).
AztecBot
force-pushed
the
pw/auto-forward-port-v5-merge-trains
branch
from
July 22, 2026 11:02
a6ed8c2 to
010569d
Compare
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
3 participants
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
nextwas cut from a reshaped snapshot ofv5-next, so the daily whole-branch merge (port-v5-next-to-next.yml) fights ~300 byte-level false conflicts againstnext's reshaped history and never converges. Genuinely-new v5 work is a small, recent set, but it drowns in that noise.Change
Replace the whole-branch merge with per-PR forward-porting, reusing the existing
port-to-next→backport.yml→port-to-next-stagingpipeline:auto-port-v5-merge-trains.yml(new): on open, label every PR into amerge-train/*-v5branch withport-to-next, sobackport.ymlcherry-picks it individually when it merges. Opt out by removing the label before merge.backport_to_staging.sh: skip empty cherry-picks (change already innext— e.g. a next→release backport bounced back) instead of reporting a false conflict; and when the target isnext, skip release-line artifacts (release bumps, per-release upgrade/deploy scripts, regenerated fixtures, v5-merge plumbing).port-v5-next-to-next.yml: disable the superseded daily schedule; keepworkflow_dispatchas a manual drift-check.Individual-PR granularity keeps each conflict small (one PR against
next, resolved by the existing ClaudeBox path) instead of one unreviewable 300-file blob.New release lines need their train pattern added to the labeler (e.g.
merge-train/*-v6).