Skip to content

ci: merge an unchanged release pull request after a hidden-type commit lands - #1436

Merged
chio-labs-delivery[bot] merged 1 commit into
mainfrom
ci/release-merge-handoff
Nov 13, 2026
Merged

chio-labs-delivery[bot] merged 1 commit into
mainfrom
ci/release-merge-handoff

Conversation

@kvlonge

@kvlonge kvlonge commented Nov 13, 2026

Copy link
Copy Markdown
Contributor

Why

When a commit lands on main while the release pull request's trusted checks run, the checks job disables auto-merge and leaves the merge to the newer commit's Release Please run. If that commit changes nothing in the release pull request (a hidden type such as docs: or ci:), Release Please reports no pull request, the checks job is skipped, and nothing re-enables auto-merge. The release pull request then sits green and unmerged until a feature or fix lands.

Changes

  • The release-please job finds the open autorelease: pending pull request when Release Please left it unchanged and exposes it as release_pr.
  • Enabling auto-merge moves from the checks job into a release-merge job that runs after the checks pass, or when they were skipped because the pull request is unchanged, and only on main.
  • Before enabling auto-merge, it requires a successful Verify status on the pull request's current head. On release branches only the trusted checks post that status, so an unchecked head never merges. The main-moved guard is unchanged.
  • The deferral summary says to re-run the latest Release Please run if the queued one already finished.

No DuckShop case applies: this changes only CI workflow behaviour.

Verification

  • actionlint on the workflow passes.
  • python -m scripts.check_release_gate reports the Verify gate valid, and pytest tests/unit/scripts/release_gate passes (47 tests).
  • One independent read-only review covered expression semantics, re-runs, token permissions, combined-status semantics and the distribution reuse in Publish. It found no blockers; both small follow-ups are applied.

…t lands

A commit landing on main during the trusted release checks makes the checks
job disable auto-merge and defer to the newer commit's Release Please run.
When that commit changes nothing in the release pull request, the checks job
was skipped and nothing re-enabled auto-merge. A release-merge job now
enables it after the checks pass or, for an unchanged pull request, when its
current head already carries a successful Verify.
@kvlonge kvlonge added the full-verify Run the full Verify matrix on this pull request label Nov 13, 2026
@chio-labs-delivery
chio-labs-delivery Bot added this pull request to the merge queue Nov 13, 2026
Merged via the queue into main with commit 71c36b3 Nov 13, 2026
32 of 53 checks passed
@chio-labs-delivery
chio-labs-delivery Bot deleted the ci/release-merge-handoff branch November 13, 2026 03:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

full-verify Run the full Verify matrix on this pull request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant