Skip to content

ci: apply private-port-next label to any v<N>-next merge-train base (v5-next)#24538

Merged
ludamad merged 1 commit into
v5-nextfrom
cb/private-port-next-v6-v5next
Jul 6, 2026
Merged

ci: apply private-port-next label to any v<N>-next merge-train base (v5-next)#24538
ludamad merged 1 commit into
v5-nextfrom
cb/private-port-next-v6-v5next

Conversation

@AztecBot

@AztecBot AztecBot commented Jul 6, 2026

Copy link
Copy Markdown
Collaborator

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 · group: slackbot

@AztecBot AztecBot added ci-draft Run CI on draft PRs. ci-no-fail-fast Sets NO_FAIL_FAST in the CI so the run is not aborted on the first failure claudebox Owned by claudebox. it can push to this PR. labels Jul 6, 2026
@ludamad
ludamad marked this pull request as ready for review July 6, 2026 15:13
@ludamad
ludamad requested a review from charlielye as a code owner July 6, 2026 15:13
@ludamad
ludamad merged commit f6d0149 into v5-next Jul 6, 2026
39 of 44 checks passed
@ludamad
ludamad deleted the cb/private-port-next-v6-v5next branch July 6, 2026 15:13
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`*
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ci-draft Run CI on draft PRs. ci-no-fail-fast Sets NO_FAIL_FAST in the CI so the run is not aborted on the first failure claudebox Owned by claudebox. it can push to this PR.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants