Repository navigation
fix(ci): stop failing PRs that are only behind main on release notes or a version collision - #7874
Conversation
…or a version collision check-stale-base-overlap.sh now warns and exits 0 when every overlapping path is a CHANGELOG.md or a .changes/ fragment; any other overlap still fails. check-changelog-parity.sh --check-bump reports VERSION COLLISION and VERSION REGRESSION without failing when CHANGELOG_PARITY_COLLISIONS is advisory. The pull_request lane sets it; the merge_group lane does not, so the queue still fails a real collision and ci-status with it. Closes #7871 Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Codex Review SummaryThis comment shows the latest Codex review activity on this pull request.
ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings. |
|
claude-security-review reviewed Security review: PR #7874 at 0a8e4e9No security findings. I reviewed all five changed files:
Why neither is a finding:
Limits: this is a logic and trust-boundary read of the diff plus a grep of the workflow for the merge-queue path. I did not run the test scripts. The instruction-exception register was not consulted, because the diff deletes no CLAUDE.md, AGENTS.md, rules, skill or hook allowlist content. |
|
claude-review reviewed No findings. I read the full diff (5 files) and the surrounding code in What the PR does
What I checked
Minor observation, not a finding |
Closes #7871
Summary
A PR that is only behind main should not fail before it reaches the merge queue, which tests every PR on the latest main. This changes two gates:
scripts/check-stale-base-overlap.shwarns and exits 0 when every overlapping path is aCHANGELOG.mdor a.changes/fragment. Any other overlapping path still fails. The script runs in thepull_requestlane and in the pre-pushcheck-affectedrun.scripts/check-changelog-parity.sh --check-bumpreportsVERSION COLLISIONandVERSION REGRESSIONwithout failing whenCHANGELOG_PARITY_COLLISIONS=advisoryis set. Only thepull_requestbranch of thecheck-pluginsbump step sets it. Themerge_groupbranch does not, so the queue still fails a real collision, andci-statusfails with it (ci-statusaggregatescheck-pluginsthe same way on both events).Fix
scripts/check-stale-base-overlap.sh: a check after the overlap is computed. When every path is a changelog, it prints a warning that lists the paths and exits 0.scripts/check-changelog-parity.sh: in advisory mode the two monotonicity findings get anADVISORYprefix and do not count toward the exit code. Every other finding class is unchanged..github/workflows/pr-require-checks.yml: thepull_requestbranch of "Verify a version bump updates the plugin's CHANGELOG.md" setsCHANGELOG_PARITY_COLLISIONS=advisory.Verification
scripts/check-stale-base-overlap.test.sh: PASS=10 FAIL=0. The new release-notes-only case fails with the old script (rc=1, STALE BASE). A non-changelog overlap next to changelogs still fails.scripts/check-changelog-parity.test.sh: PASS=108 FAIL=0. The new advisory case fails with the old script (rc=1, VERSION COLLISION). The new merge-queue case (a squash commit on main's 1.1.0, checked againstHEAD^1with no advisory mode) fails asPUBLISHED VERSION REUSE.actionlintandzizmor --offlineon the workflow: no findings.scripts/check-affected.sh --tests: the lint checks pass. Two suites fail only because this machine lacks PyYAML and the.github/standards/runner-policynode modules (scripts/pr-bump-plugin-version.test.sh,scripts/run-hygiene-gate.test.sh); CI has both.Related
pull_requestrun that was only behind main overlapped on files other than changelogs. Examples are.github/workflows/pr-unblock.yml,.github/actions/request-lane-token/*,docs/conventions/pr-pipeline.yamlandplugins/guardrails/.claude-plugin/plugin.json. The changelog-only rule does not cover those cases. Covering them means making the CI stale-base step advisory onpull_request, which the merge queue would back up. That gate guards against Stale-base squash merges silently reverted two merged fixes (CI green, issues left closed) #2691, so it is left for a maintainer decision.🤖 Generated with Claude Code