Skip to content

ci(release): filter release line pushes by path and drop the merge queue handling - #4162

Merged
datlechin merged 4 commits into
mainfrom
ci/release-line-path-filter
Nov 10, 2026
Merged

datlechin merged 4 commits into
mainfrom
ci/release-line-path-filter

Conversation

@datlechin

@datlechin datlechin commented Nov 9, 2026 •

Copy link
Copy Markdown
Member

Summary

  • ci.yml Plan: every push, to main or a release/** line, compares with the last green CI push run on its own branch. A release PR's merge changes only apple/CHANGELOG.md and apple/changelog.d/, which no suite reads, so its push runs Lint only. The first push of a new line has no green run, so it runs everything, as today.
  • detect-changed-paths.sh drops --ref, which made a release/** push run every suite (ci(release): check the tag's own CI runs instead of walking and polling #3584).
  • version.py check: a test job the tag's CI push run left out (its calling job skipped by the plan) passes when that job passed at an ancestor on the line and the job's own suite (macos or ios) has not changed since. Otherwise the errors are today's, plus the reason. Per job and per suite, not shipped with both jobs: a macOS-only pick leaves the iOS tests last passing at the cut, so shipped would refuse every tag after it, and no test job reads the release scripts in shipped.
  • Merge queue removal (off since 2026-11-09): no merge_group trigger, no merge-group base, no "the queue already passed" shortcut, no merge-group arm in Lint's changelog step. A main push now runs the suites whose paths changed since main's last green CI push run.
  • Docs: .claude/rules/ci.md, root AGENTS.md (gh pr merge <N> --auto --squash everywhere), apple/RELEASING.md (Branches records the reversal of ci(release): check the tag's own CI runs instead of walking and polling #3584; Forward-port merges with --squash), linux/docs/testing.md, two cache comments.
  • release/0.86 keeps its own files and still runs every suite on every push. This applies from the next line cut.

Test plan

  • test_version.py: a release commit takes each test job from its last pass; a left-out job is refused after a change to its suite, or with no pass at an ancestor on the line; a failed job beside a left-out one is not excused. The three new refusal and pass tests fail on main.
  • test_detect_changed_paths.py: test_a_release_branch_runs_every_suite and test_main_and_pull_request_refs_keep_the_path_filter pinned --ref and are replaced by test_a_release_pull_request_runs_no_suite (a release PR's diff selects no suite, shipped included).
  • The new ancestor check against the live release/0.86 runs returns no error; the detector from ea1eb4c2 to the v0.86.0 release commit c3eb2f247 selects no Apple suite.
  • actionlint, shellcheck --severity=warning, zizmor offline: clean. Release tooling and scripts/ci tests pass locally.
  • Not reviewed by Codex: its usage limit runs until 2026-11-14.

@datlechin
datlechin enabled auto-merge (squash) November 9, 2026 12:48
@datlechin
datlechin disabled auto-merge November 10, 2026 13:05
@datlechin
datlechin merged commit 1e6dabb into main Nov 10, 2026
43 checks passed
@datlechin
datlechin deleted the ci/release-line-path-filter branch November 10, 2026 13:05
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.

1 participant