fix(automerge): stop re-approving every sweep; direct-merge when already clean - #120
Open
toufali wants to merge 3 commits into
Open
fix(automerge): stop re-approving every sweep; direct-merge when already clean#120toufali wants to merge 3 commits into
toufali wants to merge 3 commits into
Conversation
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
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
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.
Fixes #117.
Two related auto-merge issues:
1. Re-approves the same PR every sweep (no idempotency).
approve_and_mergesubmitted a freshAPPROVEDreview every run, so a PR whoseenable_auto_mergekept failing collected 100+ duplicate approvals. Now it checksblender_approved_head(pr)— an existing BLEnderAPPROVEDreview on the current head SHA — and skips re-approving.2. Never merges on repos with no required status checks. Such repos (e.g. mozilla/fxa) go
cleanimmediately, soenablePullRequestAutoMergeis refused with "Pull request is in clean status" and the PR never merges. Now, on that specific error, BLEnder merges directly via a newmerge_prGraphQL helper (using the repo-allowed merge method). Other enable errors stillSkipPR(bounded, and no longer re-approve thanks to #1).Files:
scripts/github_utils.py(newblender_approved_head,merge_pr),scripts/automerge_dependabot.py(approve_and_merge). Bothpy_compileclean.🤖 Generated with Claude Code