Commit 888e322
authored
feat(ci): merge-train/spartan-v6 (v5-next port) (#24517)
Hand-port of the v6 merge-train wiring directly onto `v5-next`, so a
`v6-next` forked off `v5-next` carries the automation immediately
(rather than waiting for `next` → `v5-next` propagation). Companion to
the `next`-based PR #24516.
Same three-file change as #24516:
- **`merge-train-create-pr.yml`** — generalize base-branch detection
from the hard-coded `*-v5` check to any `-v<N>` suffix (`-v5` →
`v5-next`, `-v6` → `v6-next`; v5 behavior unchanged). Add
`merge-train/spartan-v6` to the `ci-full-no-test-cache` list.
- **`merge-train-next-to-branches.yml`** — add `v6-next` to the push
trigger and a branch that auto-pulls `v6-next` into
`merge-train/spartan-v6`.
- **`merge-train-stale-check.yml`** — add a `spartan-v6` stale-check job
(`BASE_BRANCH: v6-next`, `#team-alpha`), matching this branch's
guard-free job style.
`private-port-next` stays scoped to `v5-next` bases (so `spartan-v6` PRs
are not auto-forward-ported), and `notify-private-sync` / nightly
release-tag / spartan-bench are untouched — `v6-next` is a public-first
staging line, not a release line.
### Branch sequence after this lands
1. Merge this PR into `v5-next`.
2. Create `v6-next` off `v5-next` (now carrying the v6 wiring).
3. Create `merge-train/spartan-v6` off `v6-next` — `create-pr` sees the
tip is already in `v6-next` and skips; the first real commit opens the
train PR against `v6-next`.
---
*Created by
[claudebox](https://claudebox.work/v2/sessions/706da64a13de6c13) ·
group: `slackbot`*3 files changed
Lines changed: 28 additions & 8 deletions
File tree
- .github/workflows
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
27 | | - | |
28 | | - | |
| 27 | + | |
| 28 | + | |
29 | 29 | | |
30 | | - | |
31 | | - | |
| 30 | + | |
| 31 | + | |
32 | 32 | | |
33 | 33 | | |
34 | 34 | | |
| |||
52 | 52 | | |
53 | 53 | | |
54 | 54 | | |
55 | | - | |
| 55 | + | |
56 | 56 | | |
57 | 57 | | |
58 | 58 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
| 8 | + | |
8 | 9 | | |
9 | 10 | | |
10 | 11 | | |
| |||
27 | 28 | | |
28 | 29 | | |
29 | 30 | | |
30 | | - | |
31 | | - | |
32 | | - | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
33 | 34 | | |
34 | 35 | | |
35 | 36 | | |
36 | 37 | | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
37 | 42 | | |
38 | 43 | | |
39 | 44 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
36 | 36 | | |
37 | 37 | | |
38 | 38 | | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
39 | 54 | | |
40 | 55 | | |
41 | 56 | | |
| |||
0 commit comments