fix(ci): report merge train merged alerts against the base branch - #24940
Merged
fcarreiro merged 2 commits intoJul 23, 2026
Merged
Conversation
AztecBot
added
ci-draft
fcarreiro
added a commit
that referenced
this pull request
Jul 23, 2026
…4939) ## Summary Retargeted to `merge-train/spartan-v5` per request. The matching `merge-train/spartan` port is [aztec-packages#24940](#24940). The merge-train merged Slack alert was reporting the PR head branch as the destination. For [aztec-packages#24851](#24851), the PR head was `merge-train/spartan-v5` but the actual base was `v5-next`, so the Slack message was misleading. ## Changes - Pass `github.event.pull_request.base.ref` to the merged notification step as `TARGET_BRANCH`. - Make `ci3/merge_train_failure_slack_notify --merged` prefer `TARGET_BRANCH`, with a `REF_NAME` fallback for direct/local use. ## Tests - `bash -n ci3/merge_train_failure_slack_notify` - `git diff --check` --- *Created by [claudebox](https://claudebox.work/v2/sessions/85cdf7ecc9727322/jobs/1) · group: `slackbot` · requested by Facundo Carreiro · [Slack thread](https://aztecprotocol.slack.com/archives/C0AU8BULZHC/p1784809391722469?thread_ts=1784809391.722469&cid=C0AU8BULZHC)*
fcarreiro
marked this pull request as ready for review
July 23, 2026 13:05
fcarreiro
enabled auto-merge (squash)
July 23, 2026 13:05
fcarreiro
approved these changes
Jul 23, 2026
rangozd
pushed a commit
to rangozd/aztec-packages
that referenced
this pull request
Aug 5, 2026
BEGIN_COMMIT_OVERRIDE chore: declare bb.js and l1-artifacts portals once via root resolutions (AztecProtocol#24917) fix(ci): report merge train merged alerts against the base branch (AztecProtocol#24940) END_COMMIT_OVERRIDE
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Port of aztec-packages#24939 to
merge-train/spartan.The merge-train merged Slack alert was reporting the PR head branch as the destination. For v5, that produced
PR merged into merge-train/spartan-v5even though the PR base wasv5-next.Changes
github.event.pull_request.base.refto the merged notification step asTARGET_BRANCH.ci3/merge_train_failure_slack_notify --mergedpreferTARGET_BRANCH, with aREF_NAMEfallback for direct/local use.Tests
bash -n ci3/merge_train_failure_slack_notifygit diff --checkCreated by claudebox · group:
slackbot· requested by Facundo Carreiro · Slack thread