Repository navigation
ci: merge an unchanged release pull request after a hidden-type commit lands - #1436
Merged
Merged
Conversation
…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.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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:orci:), 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
release-pleasejob finds the openautorelease: pendingpull request when Release Please left it unchanged and exposes it asrelease_pr.release-mergejob that runs after the checks pass, or when they were skipped because the pull request is unchanged, and only on main.Verifystatus 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.No DuckShop case applies: this changes only CI workflow behaviour.
Verification
actionlinton the workflow passes.python -m scripts.check_release_gatereports the Verify gate valid, andpytest tests/unit/scripts/release_gatepasses (47 tests).