ci: remove Mergify auto-merge for version bump PRs#7228
Merged
Conversation
GitHub's native merge queue is enforced on main. Mergify's `merge:`
action performs a direct merge that bypasses the queue, so GitHub
rejects it ("GitHub refused to merge the pull request"). This is the
second time this pattern has bitten:
- #5871 migrated most Mergify rules from `queue:` to `merge:` when
moving to GitHub's native queue.
- #6678 (b035bd1) did the same for the version-bump rule after it
started failing with "Repository rule violations found: Changes must
be made through the merge queue" — the same error we're seeing now
on #7225.
The `merge:` action was a workaround that worked only until the
ruleset actually enforced the queue on main. Now that it does,
Mergify shouldn't be attempting the merge at all. GitHub's native
auto-merge (`gh pr merge --auto --squash` or the UI checkbox) and
"Merge when ready" flow already handle queued merges cleanly.
Scope: this PR only removes the `auto-merge version bump PRs` rule.
The `auto-merge Renovate PRs` and mergify-housekeeping rules use the
same `merge:` action pattern and will hit the same failure; they'll
be handled in follow-ups.
Co-authored-by: Cursor <cursoragent@cursor.com>
Contributor
|
This pull request does not have a backport label. Could you fix it @gsarantid? 🙏
|
Contributor
|
Tick the box to add this pull request to the merge queue (same as
|
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.
Summary
Removes the
auto-merge version bump PRsMergify rule from.mergify.ymlso GitHub's native merge queue owns merging intomain.Rationale
GitHub's native merge queue is enforced on
main. Mergify'smerge:action performs a direct merge, which bypasses the queue — GitHub then rejects it with "GitHub refused to merge the pull request". This is the second time this pattern has bitten:queue:tomerge:when moving to GitHub's native queue.b035bd1f) did the same for the version-bump rule after it started dequeuing with"Repository rule violations found: Changes must be made through the merge queue"— the same error we're seeing now on Bump cloudbeat version to 9.5.0 #7225.The
merge:action was a stopgap that worked only until the ruleset actually enforced the queue. Now that it does, Mergify shouldn't be attempting the merge at all — GitHub's native auto-merge (gh pr merge --auto --squashor the UI checkbox) and "Merge when ready" flow already handle queued merges cleanly, so this rule is redundant and actively harmful.Scope
Narrow — only removes the
auto-merge version bump PRsrule. Theauto-merge Renovate PRs(line 16) and mergify-housekeeping (line 93) rules use the samemerge:action pattern and are latent versions of the same bug — they'll be handled in follow-ups once they actually surface, to keep this PR focused.Test plan
.mergify.ymlstill parses as valid YAMLname/conditions/actions, only known Mergify actions used (assign,backport,close,comment,label,merge,review)Made with Cursor