feat(ci): merge-train/spartan-v6#24516
Merged
Merged
Conversation
AztecBot
added
ci-draft
ludamad
approved these changes
Jul 3, 2026
ludamad
changed the title
This was referenced Jul 6, 2026
ludamad
pushed a commit
that referenced
this pull request
Jul 6, 2026
…v5-next) (#24538) Follow-up to the merged v6 merge-train wiring (#24516 / #24517). Generalizes the `private-port-next` auto-label in `merge-train-create-pr.yml` from `v5-next`-only to any `v<N>-next` base, so `merge-train/spartan-v6` PRs into `v6-next` are automatically forward-ported by the private-port-next driver — matching the agreed v6 plan (v6-next work is forward-ported, not held). ``` - if [[ "$base_branch" == "v5-next" ]]; then + if [[ "$base_branch" =~ ^v[0-9]+-next$ ]]; then ``` No change to v5 behavior (`v5-next` still matches). Hand-ported onto `v5-next` so a `v6-next` forked off it carries the rule immediately; companion PR opened against `next` to keep the two workflow copies identical. --- *Created by [claudebox](https://claudebox.work/v2/sessions/706da64a13de6c13) · group: `slackbot`*
ludamad
pushed a commit
that referenced
this pull request
Jul 6, 2026
…24539) Follow-up to the merged v6 merge-train wiring (#24516 / #24517). Generalizes the `private-port-next` auto-label in `merge-train-create-pr.yml` from `v5-next`-only to any `v<N>-next` base, so `merge-train/spartan-v6` PRs into `v6-next` are automatically forward-ported by the private-port-next driver — matching the agreed v6 plan. ``` - if [[ "$base_branch" == "v5-next" ]]; then + if [[ "$base_branch" =~ ^v[0-9]+-next$ ]]; then ``` No change to v5 behavior (`v5-next` still matches). Companion to #24538 (same change on `v5-next`), keeping the `next`/`v5-next` copies of this workflow identical. --- *Created by [claudebox](https://claudebox.work/v2/sessions/706da64a13de6c13) · group: `slackbot`*
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
2 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.
Sets up the merge-train automation for a
v6-nextrelease line, mirroring the existingspartan-v5→v5-nextpattern, so public v6 work can run onmerge-train/spartan-v6targetingv6-next(forked offv5-next).Changes
merge-train-create-pr.yml— generalize base-branch detection from a hard-coded*-v5check to any-v<N>suffix (-v5→v5-next,-v6→v6-next; no change to v5 behavior). Addmerge-train/spartan-v6to theci-full-no-test-cachelist.merge-train-next-to-branches.yml— addv6-nextto the push trigger and a branch for it that auto-pullsv6-nextintomerge-train/spartan-v6.merge-train-stale-check.yml— add a dailyspartan-v6stale-check job (BASE_BRANCH: v6-next,#team-alpha).Deliberately out of scope
private-port-nextlabel stays scoped tov5-nextbases, sospartan-v6PRs are not auto-forward-ported tonext.v6-nextis a staging line to be ported at release time, not per-PR.notify-private-sync.ymlis untouched —v6-nextis public-first with no private mirror, so it must not dispatch a (non-existent)sync-upstream-v6-next.yml.v6-nextis not a release line yet.Required branch-creation sequence (needs branch-push rights — not doable via the bot)
These workflows execute from the pushed branch's own copy, so the wiring must be present on
v6-nextbefore the train branch is created:nextand let it propagate tov5-next(the merge-train workflows are kept byte-identical acrossnext/v5-next), or mergenext→v5-nextonce this lands.v6-nextoffv5-next(now carrying the v6 wiring).merge-train/spartan-v6offv6-next.create-prwill see the tip is already inv6-nextand skip; the first real commit opens the train PR againstv6-next.Creating
merge-train/spartan-v6before step 2 completes would makecreate-prfall back to basenextand open a spurious full-diff PR — so keep the ordering.Created by claudebox · group:
slackbot