ci(desktop): merge release PR directly when mergeable, else auto-merge#34
Merged
Merged
Conversation
The release version-bump PR step now checks the PR's mergeStateStatus: when CLEAN it squash-merges immediately, otherwise it falls back to enabling auto-merge. Shared merge args are factored into an array.
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
1 participant
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.
What
The desktop release workflow's version-bump PR step (
Enable auto-merge) currently always usesgh pr merge --auto, which waits on GitHub's auto-merge even when the PR is already mergeable.This change makes it check the PR's
mergeStateStatusfirst:CLEAN→ squash-merge immediately (gh pr mergewithout--auto)gh pr merge --auto)Shared merge args (
--squash,--delete-branch,--subject) are factored into amerge_argsarray to avoid duplication. The step is renamed toMerge or enable auto-merge.Why
Lets the release version PR land right away when it's already green, instead of always routing through auto-merge.
🤖 Generated with Claude Code