Skip to content

fix(ci): rerun squashed PR check on base branch change#22713

Merged
spalladino merged 1 commit into
merge-train/spartanfrom
palla/squashed-pr-check-edited
Apr 22, 2026
Merged

fix(ci): rerun squashed PR check on base branch change#22713
spalladino merged 1 commit into
merge-train/spartanfrom
palla/squashed-pr-check-edited

Conversation

@spalladino

Copy link
Copy Markdown
Contributor

Motivation

When a PR fails the Squashed PR Check against next and the author then changes the base branch to a merge-train (where the check does not apply), the stale failure remained on the PR. This blocked the PR from merging cleanly without manual intervention.

Approach

Add edited to the pull_request trigger types. GitHub fires edited whenever the base branch (or title/body) changes, so the workflow reruns, the job's if guard evaluates false, and the skipped run supersedes the earlier failure status.

Changes

  • .github/workflows/squashed-pr-check.yml: include edited in the pull_request event types so base branch changes retrigger the workflow

Add 'edited' to the pull_request trigger types so the Squashed PR Check
reruns when a PR's base branch is changed. Previously, if a check failed
against 'next' and the base was later switched to a merge-train branch,
the stale failure would stick around.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
@spalladino spalladino requested a review from charlielye as a code owner April 21, 2026 21:09
@spalladino spalladino changed the base branch from next to merge-train/spartan April 22, 2026 14:13
@spalladino spalladino merged commit 379ee10 into merge-train/spartan Apr 22, 2026
23 checks passed
@spalladino spalladino deleted the palla/squashed-pr-check-edited branch April 22, 2026 14:14
chrismarino pushed a commit to chrismarino/aztec-packages that referenced this pull request May 5, 2026
BEGIN_COMMIT_OVERRIDE
fix(kv-store): ensure LMDB cursor is closed on iteration abort (AztecProtocol#22509)
fix(telemetry-client): use appropriate histogram buckets for L1 gas
prices (AztecProtocol#22512)
fix(telemetry-client): log warning when BatchSpanProcessor drops spans
(AztecProtocol#22511)
fix(stdlib): wrap HA signer databaseUrl in SecretValue (AztecProtocol#22510)
fix(prover-client): don't mark in-progress epoch N jobs as stale when
epoch N+1 starts (AztecProtocol#22508)
chore: (A-730) graceful shutdown for services in node startup failure
path (AztecProtocol#22112)
fix(prover-client): reject stale job promises and count timeouts toward
retry limit (AztecProtocol#21842)
feat(archiver): validate historical L1 log availability at startup
(AztecProtocol#22644)
fix(archiver): do not query MessageSent events by blockhash (AztecProtocol#22641)
refactor(e2e): skip initial sequencer in p2p and epochs tests (AztecProtocol#22535)
fix: handle missing L1 finalized block on devnets (AztecProtocol#22663)
fix(world-state): treat historical block 0 queries as historical, not
latest (AztecProtocol#22679)
fix(sequencer): re-check parent checkpoint validity before pipelined L1
submission (AztecProtocol#22586)
fix(world-state): make block 0 a first-class historical block (AztecProtocol#22711)
chore: show all running versions (AztecProtocol#22376)
chore: fix prettier inside worktrees (AztecProtocol#22557)
feat: use optimized verifier for rollup (AztecProtocol#21840)
fix(kv-store): skip pool creation on ephemeral deleteDb to unstick
browser tests (AztecProtocol#22693)
chore: rm claude lockfile (AztecProtocol#22718)
fix(e2e): wait for first checkpoint in fee_asset_price_oracle_gossip
test (AztecProtocol#22719)
chore(prover-node): track estimated L1 fee when proof publishing is
disabled (AztecProtocol#22691)
fix(ci): rerun squashed PR check on base branch change (AztecProtocol#22713)
feat(archiver): decouple calldata from blob fetching in L1 synchronizer
(AztecProtocol#22716)
refactor(e2e): enable pipelining in e2e_epochs tests (AztecProtocol#22544)
feat(p2p): reject and evict txs with insufficient max fee per gas
(AztecProtocol#22118)
refactor(world-state): always index block 0 regardless of initial tree
size (AztecProtocol#22724)
fix(e2e): fix redistribution test (AztecProtocol#22729)
END_COMMIT_OVERRIDE
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants