Skip to content

chore: backport merge-train/spartan-v5 wiring to v5-next#23860

Merged
spalladino merged 1 commit into
v5-nextfrom
cb/backport-spartan-v5-wiring
Jun 4, 2026
Merged

chore: backport merge-train/spartan-v5 wiring to v5-next#23860
spalladino merged 1 commit into
v5-nextfrom
cb/backport-spartan-v5-wiring

Conversation

@AztecBot

@AztecBot AztecBot commented Jun 4, 2026

Copy link
Copy Markdown
Collaborator

Backports the merge-train/spartan-v5 wiring from #23831 (merged to next) onto v5-next.

Why this is needed

The base→train sync (merge-train-next-to-branches.yml) is push-triggered, and for a push event GitHub Actions runs the workflow file as it exists on the pushed branch. v5-next still has the old workflow (triggers only on next, no spartan-v5 routing), so commits landing on v5-next never fire the sync into merge-train/spartan-v5. Putting the wiring on v5-next makes that sync fire for every subsequent push to v5-next.

This is a cherry-pick of #23831's squashed commit onto v5-next — same 12-file changeset, no v5-specific divergence (the merge-train infra files merged cleanly; v5-next's newer actions/checkout pin is preserved).

After merge

Future pushes to v5-next will sync into merge-train/spartan-v5. The commit that already landed on v5-next (chore: backport merge-train/spartan PRs to v5-next #23846) won't retroactively trigger — it needs either a fresh push to v5-next or a one-time manual scripts/merge-train/merge-next.sh merge-train/spartan-v5 v5-next to catch the train up.

Labeled ci-skip — workflow/script/docs config only.


Created by claudebox · group: slackbot

Backports the merge-train/spartan-v5 wiring from #23831 (merged to next)
onto v5-next. Until v5-next physically contains the updated
merge-train-next-to-branches.yml, pushes to v5-next don't trigger the
base->train sync (push events run the workflow from the pushed branch's
own copy), so commits landing on v5-next never reach
merge-train/spartan-v5. This puts the wiring on v5-next so that sync
fires going forward.
@AztecBot AztecBot added ci-draft Run CI on draft PRs. ci-skip claudebox Owned by claudebox. it can push to this PR. labels Jun 4, 2026
@spalladino spalladino marked this pull request as ready for review June 4, 2026 12:40
@spalladino spalladino requested a review from charlielye as a code owner June 4, 2026 12:40
@spalladino spalladino merged commit 9ef51dc into v5-next Jun 4, 2026
38 of 44 checks passed
@spalladino spalladino deleted the cb/backport-spartan-v5-wiring branch June 4, 2026 12:40
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-skip 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