feat(ci): merge-train/spartan-v6 (v5-next port) - #24517
Merged
Merged
Conversation
AztecBot
added
ci-draft
ludamad
marked this pull request as ready for review
July 3, 2026 22:05
ludamad
approved these changes
Jul 3, 2026
ludamad
changed the title
ludamad
added this pull request to the merge queue
Jul 3, 2026
Collaborator
Author
Flakey Tests🤖 says: This CI run detected 1 tests that failed, but were tolerated due to a .test_patterns.yml entry. |
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`*
danielntmd
pushed a commit
to danielntmd/aztec-packages
that referenced
this pull request
Jul 13, 2026
…ztecProtocol#24585) Documents the new v6 release line in the `CLAUDE.md` git-workflow base-branch guidance, so contributors and agents pick `merge-train/spartan-v6` (→ `v6-next`) for v6 work instead of defaulting to `merge-train/spartan` or `next`. Mirrors the existing `spartan-v5` → `v5-next` note. ``` -For work scoped to the v5 release line, use `merge-train/spartan-v5` (which targets `v5-next`) in place of `merge-train/spartan`. +For work scoped to a release line, use the matching `merge-train/spartan-v<N>` … `spartan-v5` targets `v5-next`, and `spartan-v6` targets `v6-next` (the public staging line for v6 work). ``` Doc-only. Companion to the merged v6 merge-train wiring (AztecProtocol#24516 / AztecProtocol#24517) and label generalization (AztecProtocol#24538 / AztecProtocol#24539). --- *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.
Hand-port of the v6 merge-train wiring directly onto
v5-next, so av6-nextforked offv5-nextcarries the automation immediately (rather than waiting fornext→v5-nextpropagation). Companion to thenext-based PR #24516.Same three-file change as #24516:
merge-train-create-pr.yml— generalize base-branch detection from the hard-coded*-v5check to any-v<N>suffix (-v5→v5-next,-v6→v6-next; v5 behavior unchanged). Addmerge-train/spartan-v6to theci-full-no-test-cachelist.merge-train-next-to-branches.yml— addv6-nextto the push trigger and a branch that auto-pullsv6-nextintomerge-train/spartan-v6.merge-train-stale-check.yml— add aspartan-v6stale-check job (BASE_BRANCH: v6-next,#team-alpha), matching this branch's guard-free job style.private-port-nextstays scoped tov5-nextbases (sospartan-v6PRs are not auto-forward-ported), andnotify-private-sync/ nightly release-tag / spartan-bench are untouched —v6-nextis a public-first staging line, not a release line.Branch sequence after this lands
v5-next.v6-nextoffv5-next(now carrying the v6 wiring).merge-train/spartan-v6offv6-next—create-prsees the tip is already inv6-nextand skips; the first real commit opens the train PR againstv6-next.Created by claudebox · group:
slackbot