fix(automerge): use a repo-allowed merge method; surface enable_auto_merge errors - #110
Merged
Conversation
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
…alse success Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
There was a problem hiding this comment.
Pull request overview
This PR fixes a silent auto-merge failure mode in BLEnder’s Dependabot automerge workflow by selecting a merge method that the target repository actually allows and by surfacing GraphQL auto-merge enablement errors instead of logging success.
Changes:
- Add merge-method selection logic that prefers
SQUASHbut falls back toMERGEorREBASEbased on repo settings. - Update the GraphQL mutation to accept the merge method as a variable and pass the selected method.
- Propagate
enable_auto_mergefailures up to the main loop by raisingSkipPRwith the actual error message.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
| scripts/github_utils.py | Select an allowed merge method from repo settings and pass it into the GraphQL auto-merge mutation; continue returning a string error on failure. |
| scripts/automerge_dependabot.py | Treat enable_auto_merge failures as actionable by raising SkipPR with the returned error instead of proceeding as if auto-merge was enabled. |
…_merge error path Addresses review feedback on #110: unit tests for merge-method selection (squash disabled -> MERGE) and approve_and_merge raising SkipPR when enable_auto_merge returns an error. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
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.
Fixes #109.
Problem
enable_auto_mergehardcodesmergeMethod: SQUASH, which fails on repos that disable squash merges (e.g.mozilla/fxa, merge-commit-only).approve_and_mergeignores the returned error and logsAuto-merge enabledregardless, so PRs are approved but never auto-merge — silently.Fix
github_utils.py: add_allowed_merge_method()— pick a method the repo permits (preferSQUASH, elseMERGE, elseREBASE) and pass it to the mutation as a variable.automerge_dependabot.py:approve_and_mergenow checksenable_auto_merge's return and raisesSkipPR(...)with the real error, so a failure is reported honestly instead of logged as success.Testing
Not run in the Actions context (needs app creds). Both files
py_compileclean. Behavior on squash-enabled repos is unchanged (SQUASH is still preferred); merge-commit-only repos now fall back toMERGE.🤖 Generated with Claude Code