Skip to content

docs: note merge-train/spartan-v6 → v6-next in the base-branch table#24585

Merged
ludamad merged 1 commit into
nextfrom
cb/claudemd-spartan-v6-base
Jul 7, 2026
Merged

docs: note merge-train/spartan-v6 → v6-next in the base-branch table#24585
ludamad merged 1 commit into
nextfrom
cb/claudemd-spartan-v6-base

Conversation

@AztecBot

@AztecBot AztecBot commented Jul 7, 2026

Copy link
Copy Markdown
Collaborator

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-v5v5-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 (#24516 / #24517) and label generalization (#24538 / #24539).


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 7, 2026
@ludamad ludamad marked this pull request as ready for review July 7, 2026 19:17
@ludamad ludamad added this pull request to the merge queue Jul 7, 2026
@AztecBot

AztecBot commented Jul 7, 2026

Copy link
Copy Markdown
Collaborator Author

Flakey Tests

🤖 says: This CI run detected 1 tests that failed, but were tolerated due to a .test_patterns.yml entry.

\033FLAKED\033 (8;;http://ci.aztec-labs.com/2c20fa72d2bee5ea�2c20fa72d2bee5ea8;;�):  yarn-project/end-to-end/scripts/run_test.sh simple src/e2e_epochs/epochs_invalidate_block.parallel.test.ts "proposer invalidates multiple checkpoints" (429s) (code: 0) group:e2e-p2p-epoch-flakes

Merged via the queue into next with commit 74b84ea Jul 7, 2026
51 of 55 checks passed
@ludamad ludamad deleted the cb/claudemd-spartan-v6-base branch July 7, 2026 20:14
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