Skip to content

fix(ci): diff-scope the no-major changeset guard against the merge base (#7005) #7048

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
os-project-manager merged 2 commits into from
Aug 9, 2026
Merged

fix(ci): diff-scope the no-major changeset guard against the merge base (#7005) #7048

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e8b317
fix(ci): diff-scope the no-major changeset guard against the merge ba…
Aug 9, 2026
7c8ec66
Merge branch 'main' into claude/issue-7005-diff-scope-no-major
os-project-manager Aug 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion .github/workflows/pr-automation.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -822,8 +822,21 @@ jobs:
# never the event payload. Its comment block carries the argument: what the
# payload read cost, where this diverges from #5580's `skip-changeset` read
# and why, the residual it leaves, and what re-arms the whole thing.
#
# `--base` takes the same merge base the two gates above take, for the
# same #6129 reason one defect along (#7005). This script used to read
# the whole `.changeset` directory with no branch point, so its verdict
# was a function of what main carried rather than of what the author
# wrote. That was invisible while pre-mode held and would have become
# visible all at once at `changeset pre exit`: 171 consumed-but-undeleted
# major changesets sit on main until the post-exit `changeset version`
# removes them, so every unlabelled PR open in that window would have
# gone red listing files it never touched, with `allow-major` -- a label
# meaning "a whole-stack major is intended HERE" -- as its only way out.
if: >-
steps.labels.outputs.skip != 'true'
&& steps.labels_settled.outputs.skip != 'true'
&& steps.allow_major.outputs.allow != 'true'
run: node scripts/check-changeset-no-major.mjs
env:
MERGE_BASE: ${{ steps.diffbase.outputs.merge_base }}
run: node scripts/check-changeset-no-major.mjs --base "$MERGE_BASE"
Loading
Loading