Repository navigation
fix(pr-merge): do not queue a head a pr-unblock lane stopped #10777
Description
Problem
About 20-26 merge-group runs a day fail on a designed hold, and ci-status checks that hold only after every lane leg has run, about 32 job-minutes each. pr-merge's enable-auto-merge already refuses labels, body and member holds, hold and cost paths, the verifier verdict and the kill switch before it arms. The one ci-status hold it does not check is a failing pr-unblock/* status on the head, so it queues a head a pr-unblock lane stopped, and the merge queue then ejects it.
Acceptance criteria
merge-holds.mjsexports the pr-unblock rule as ci-status states it (unblockStops,readStatuses).enable-auto-mergereads the head's commit statuses and does not queue a head a pr-unblock lane stopped. It disarms one already armed and adds a run-summary line for each.- A head whose statuses do not read is not queued, and an armed one is disarmed (fails closed).
- A later success status for the same context clears the stop, and a head with no stop still arms.
- No hold loosens: ci-status's own steps are unchanged.
Not in scope
#10747 stays the follow-up: switching ci-status to the shared rule, and early merge_group hold checks in select-tests.
Activity
github-actions commentedon Oct 28, 2026
Proposed work class: work-class: scoped
Basis: automated intake triage; the lanes App applied this class.
Size: Small
Complexity: Low
Uncertainty: Known
Flags: none
Blocked by: none
Understood: pr-merge's enable-auto-merge should read a head's commit statuses via a shared rule in merge-holds.mjs. It should not queue, and should disarm, a head whose pr-unblock/* lane status is failing. It should fail closed when the statuses can't be read. The acceptance criteria are exact and the follow-up (#10747) is out of scope. No duplicates found; #10747 and #10434 are related but not the same work.
Automated triage, applied by the lanes App.
melodic-automation-lanes commentedon Oct 28, 2026
Not admitted to the issue lane: a criterion names .github/workflows/pr-require-checks.yml, which the issue lane cannot push (patch-protected-path); a builder session takes it. Admission takes the issue once each of those is met, when intake triages it again (
.github/actions/resolve-config/admission-rules.json).melodic-automation-lanes commentedon Oct 28, 2026
The latest triage verdict holds nothing: admission moved the issue to
status: confirmed; its comment says why.melodic-automation-lanes commentedon Oct 28, 2026
Refinement. A read-only run explored this repository, searched its issues and pull requests, and read the allowed docs to draft what follows. On an issue a listed human filed, it counts as the issue's spec once posted, while unedited; it is still model text, so check it.
Intended outcome: pr-merge's enable-auto-merge reads a head's commit statuses through a shared rule exported from merge-holds.mjs, refuses to queue and disarms a head a pr-unblock lane stopped, and fails closed on unreadable statuses.
Acceptance criteria
.github/scripts/pr-merge/merge-holds.mjsexportsunblockStopsandreadStatuses, and neither exists there today.unblockStopsapplies ci-status's rule: for eachpr-unblock/*context, only the newest status fromgithub-actions\[bot\]counts, and the context stops the head when that state isfailureorerror.unblockStopsignores statuses from other creators and ignores contexts that do not start withpr-unblock/.successstatus on the same context clears the stop, and a head with no stop still arms; a unit test covers each.enable-auto-mergereads the head's commit statuses viareadStatusesand does not arm auto-merge for a head with a stop; a test inenable-auto-merge.test.mjsasserts no arm call.enable-auto-mergedisarms a head that is already armed and has a stop; a test asserts the disarm call.Fail a head a pr-unblock lane stoppedin.github/workflows/pr-require-checks.ymlis unchanged, andscripts/ci-hold-pr-unblock-status.test.shstill passes.enable-auto-merge(labels, body, member, hold and cost paths, verifier verdict, kill switch) is loosened, and the existingpr-mergetests pass.Dependencies
Related work
Sources read
pr-unblock/*status is failure or error, takes the head live in merge_group, and fails closed on unparsable refs, non-SHA heads or unreadable statuses.unblockStopsorreadStatusesanywhere in the checkout.Automated refinement by the lanes App. Intake triages the issue again with it.