ci: wire up merge-train/spartan-v6 → v6-next release line (v5-next)

Author: AztecBot

.github/workflows/merge-train-create-pr.yml

@@ -24,11 +24,11 @@ jobs:
             branch="${{ github.ref_name }}"
 
             # Determine base branch. Most trains target next; trains suffixed
-            # with -v5 (e.g. spartan-v5, fairies-v5) target the v5 release line
-            # (v5-next) instead.
+            # with -v<N> (e.g. spartan-v5, fairies-v5, spartan-v6) target the
+            # matching release line (v5-next, v6-next) instead.
             base_branch="next"
-            if [[ "$branch" == *-v5 ]]; then
-              base_branch="v5-next"
+            if [[ "$branch" =~ -v([0-9]+)$ ]]; then
+              base_branch="v${BASH_REMATCH[1]}-next"
             fi
 
             # Skip if this is a merge commit (check for multiple parents)
@@ -52,7 +52,7 @@ jobs:
 
               # Create PR with ci-no-squash label
               labels="ci-no-squash"
-              if [[ "$branch" == "merge-train/spartan" || "$branch" == "merge-train/spartan-v5" || "$branch" == "merge-train/ci" ]]; then
+              if [[ "$branch" == "merge-train/spartan" || "$branch" == "merge-train/spartan-v5" || "$branch" == "merge-train/spartan-v6" || "$branch" == "merge-train/ci" ]]; then
                 labels="$labels,ci-full-no-test-cache"
               fi
               # Trains targeting the v5 release line are ports into v5-next.

.github/workflows/merge-train-next-to-branches.yml

@@ -5,6 +5,7 @@ on:
     branches:
       - next
       - v5-next
+      - v6-next
 
 jobs:
   merge-to-trains:
@@ -27,13 +28,17 @@ jobs:
           GH_TOKEN: ${{ secrets.AZTEC_BOT_GITHUB_TOKEN }}
           COMMIT_SHA: ${{ github.sha }}
         run: |
-          # The -v5 trains track the v5 release line (v5-next); every other
-          # train tracks next. Sync only the trains fed by the branch that was
-          # just pushed.
+          # The -v<N> trains track the matching release line (v5-next, v6-next);
+          # every other train tracks next. Sync only the trains fed by the
+          # branch that was just pushed.
           if [[ "${{ github.ref_name }}" == "v5-next" ]]; then
             for branch in merge-train/spartan-v5 merge-train/fairies-v5; do
               ./scripts/merge-train/merge-next.sh "$branch" v5-next || true
             done
+          elif [[ "${{ github.ref_name }}" == "v6-next" ]]; then
+            for branch in merge-train/spartan-v6; do
+              ./scripts/merge-train/merge-next.sh "$branch" v6-next || true
+            done
           else
             for branch in merge-train/avm merge-train/barretenberg merge-train/ci merge-train/docs merge-train/fairies merge-train/spartan; do
               ./scripts/merge-train/merge-next.sh "$branch" || true

.github/workflows/merge-train-stale-check.yml

@@ -36,6 +36,21 @@ jobs:
           BASE_BRANCH: v5-next
         run: ./ci3/merge_train_stale_check merge-train/spartan-v5 '#team-alpha'
 
+  spartan-v6:
+    name: Check merge-train/spartan-v6
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      pull-requests: read
+    steps:
+      - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
+      - name: Run stale check
+        env:
+          GH_TOKEN: ${{ secrets.AZTEC_BOT_GITHUB_TOKEN }}
+          SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
+          BASE_BRANCH: v6-next
+        run: ./ci3/merge_train_stale_check merge-train/spartan-v6 '#team-alpha'
+
   fairies-v5:
     name: Check merge-train/fairies-v5
     runs-on: ubuntu-latest