docs(CI): the merge gate is ci.yml's Arm auto-merge, not an arm on mergeable #1741

Merged
jaylouisw merged 1 commit from docs/1116-2215 into main 2026-11-16 22:25:30 +00:00
Owner

docs/CI.md said pull requests are armed with squash auto-merge "as soon as mergeable settles". That stopped being true in #1725 (0389592e, 2026-11-16 20:37 UTC).

What the code does now

  • pr-rebase.yml and auto-rebase.yml both call checks_green(head), which filters out its own status, requires every remaining status to be success, and requires the three CI / Test (Node *) contexts to be present (legs >= 3). Not green means the run prints checks on <sha> are not green yet - ci.yml's Arm auto-merge job merges this once they are and exits 0 with the branch untouched.
  • ci.yml gained a seventh job, Arm auto-merge (needs: [changes, test, smoke, docker], if: always() && github.event_name == 'pull_request' && needs.changes.outputs.live != 'false'). It asks /commits/{sha}/status for the verdict rather than trusting needs, merges with head_commit_id so a head that has since been rebased away is refused server-side, treats 405 on mergeable as "not computed yet" and waits up to 90 s, and never goes red.

This PR

  • rewrites ## Merging around the new gate, including the measurement the workflow itself carries (25 of 25 recent merges landed before any check reported, 15 with no status at all on the head; #1719 armed 19:59:43, merged 19:59:54, its first test leg finished 20:00:46);
  • corrects the ci.yml, auto-rebase.yml and pr-rebase.yml rows of the workflow table, all three of which described the old unconditional arm;
  • keeps the five-check table (those are still the five checks on the diff) and names the two job statuses that are not checks on it: Classify the change and Arm auto-merge.

Confirmed the seven-status set of the pre-#1725 era on PR #1737's head via /commits/{sha}/status (Classify, PR rebase, smoke, docker, three test legs).

Docs-only. node scripts/syntax-check.js 364 files OK; check-control-bytes clean, no control bytes; check-doc-citations 355 citations, exit 0.

`docs/CI.md` said pull requests are armed with squash auto-merge "as soon as `mergeable` settles". That stopped being true in #1725 (0389592e, 2026-11-16 20:37 UTC). **What the code does now** - `pr-rebase.yml` and `auto-rebase.yml` both call `checks_green(head)`, which filters out its own status, requires every remaining status to be `success`, and requires the three `CI / Test (Node *)` contexts to be present (`legs >= 3`). Not green means the run prints `checks on <sha> are not green yet - ci.yml's Arm auto-merge job merges this once they are` and exits 0 with the branch untouched. - `ci.yml` gained a seventh job, `Arm auto-merge` (`needs: [changes, test, smoke, docker]`, `if: always() && github.event_name == 'pull_request' && needs.changes.outputs.live != 'false'`). It asks `/commits/{sha}/status` for the verdict rather than trusting `needs`, merges with `head_commit_id` so a head that has since been rebased away is refused server-side, treats `405` on `mergeable` as "not computed yet" and waits up to 90 s, and never goes red. **This PR** - rewrites `## Merging` around the new gate, including the measurement the workflow itself carries (25 of 25 recent merges landed before any check reported, 15 with no status at all on the head; #1719 armed 19:59:43, merged 19:59:54, its first test leg finished 20:00:46); - corrects the `ci.yml`, `auto-rebase.yml` and `pr-rebase.yml` rows of the workflow table, all three of which described the old unconditional arm; - keeps the five-check table (those are still the five checks on the diff) and names the two job statuses that are not checks on it: `Classify the change` and `Arm auto-merge`. Confirmed the seven-status set of the pre-#1725 era on PR #1737's head via `/commits/{sha}/status` (Classify, PR rebase, smoke, docker, three test legs). Docs-only. `node scripts/syntax-check.js` 364 files OK; `check-control-bytes` clean, no control bytes; `check-doc-citations` 355 citations, exit 0.
docs(CI): the merge gate is ci.yml's Arm auto-merge, not an arm on mergeable (#1725)
All checks were successful
CI / Classify the change (pull_request) Successful in 17s
PR rebase / Rebase onto main and arm auto-merge (pull_request) Successful in 24s
CI / Server smoke test (pull_request) Successful in 22s
CI / Docker build (pull_request) Successful in 33s
CI / Test (Node 20) (pull_request) Successful in 1m4s
CI / Test (Node 18) (pull_request) Successful in 1m8s
CI / Test (Node 22) (pull_request) Successful in 1m7s
CI / Arm auto-merge (pull_request) Successful in 5s
8707fe223a
docs/CI.md said pull requests are armed 'as soon as mergeable settles'. Since 0389592e that sentence describes a path that no longer exists: pr-rebase.yml and auto-rebase.yml both refuse to arm unless checks_green() sees every reported status green with the three Test (Node *) legs present, and the merge itself moved to a new ci.yml job, Arm auto-merge, which runs after the checks it reads and merges with head_commit_id.

Verified against the workflows: checks_green filters its own context and requires legs >= 3; the arm job reads /commits/{sha}/status, distinguishes a skipped data-only leg from a leg that never reported, waits up to 90 s for mergeable, and only ever warns. Also recorded the measurement the workflow carries (25 of 25 merges before any check reported, 15 with no status at all; #1719 armed 19:59:43, merged 19:59:54, first leg 20:00:46) and confirmed the seven-status set on a real PR head via /commits/{sha}/status.

The five-check table is unchanged - those are still the five checks on the diff - but the page now names the two job statuses that are not checks on it.
jaylouisw force-pushed docs/1116-2215 from 8707fe223a
All checks were successful
CI / Classify the change (pull_request) Successful in 17s
PR rebase / Rebase onto main and arm auto-merge (pull_request) Successful in 24s
CI / Server smoke test (pull_request) Successful in 22s
CI / Docker build (pull_request) Successful in 33s
CI / Test (Node 20) (pull_request) Successful in 1m4s
CI / Test (Node 18) (pull_request) Successful in 1m8s
CI / Test (Node 22) (pull_request) Successful in 1m7s
CI / Arm auto-merge (pull_request) Successful in 5s
to f409779f25
All checks were successful
CI / Classify the change (pull_request) Successful in 15s
PR rebase / Rebase onto main and arm auto-merge (pull_request) Successful in 17s
CI / Server smoke test (pull_request) Has been skipped
CI / Docker build (pull_request) Has been skipped
CI / Test (Node 20) (pull_request) Successful in 53s
CI / Test (Node 18) (pull_request) Successful in 56s
CI / Test (Node 22) (pull_request) Successful in 1m0s
CI / Arm auto-merge (pull_request) Successful in 14s
2026-11-16 22:23:00 +00:00
Compare
Sign in to join this conversation.
No reviewers
No milestone
No project
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
jaylouisw/packetforge!1741
No description provided.