merge on green: 'automerge: exact' catches up branch and allows MoG merge commits #5096
Assignees
Labels
bot: merge on green
priority: p3
Desirable enhancement or fix. May not be included in next release.
type: feature request
‘Nice-to-have’ improvement, new feature or different behavior or design.
Comments
sofisl
added a commit
that referenced
this issue
Jun 11, 2024
) I noticed in googleapis/nodejs-pubsub#1927 that merge-on-green kept dismissing auto-approve's latest review due to post-processor updates, other commits, etc. Ideally, those commits would retrigger auto-approve to re-review the PR. But there seems to be a race condition where sometimes merge-on-green beats auto-approve to re-approving and dismisses the PR. This fix would allow auto-approve to listen to reviews dismissed, so that it always has a chance to re-review the most recent commit when an `automerge: exact` label has been placed. As part of this work, the pull_request_review.dismissed event needs to access the pr number through [`pull_request.number`](https://docs.github.com/en/webhooks/webhook-events-and-payloads#pull_request_review), so I had to update this for all the events and make sure the test fixtures had the appropriate number there too. Fixes #5096
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Is your feature request related to a problem? Please describe.
I want an external contribution that I've approved to be merged automatically with
automerge: exact(so that the contributor does not sneak an extra commit in post-approval/pre-automerge), but without having to reapprove whenever the branch is caught up by an automatic merge-commit (e.g. from MoG mergingmaininto the branch). In a high traffic (lots of merges) repository with long running presubmits (kokoro, on the order of tens of minutes), each time I have to catch up a PR branch, it requires I reapprove the PR to satisfyautomerge: exact. This is toil.Describe the solution you'd like
I would like MoG to do the following with
automerge: exact:automergealready does)Describe alternatives you've considered
Use
automerge- this might be fine since I think external contributions require that Kokoro presubmits be manually run by maintainers, but that ties us to Kokoro, something we may want to get away from in the future, and that not all repos use.Babysit the PR with
automerge: exact, manually catching up the branch and reapproving. This is just toilsome but not the worst.Additional context
The PR in question was googleapis/google-cloud-go#8196, in
google-cloud-go, a mono-repo that has decent commit traffic and slow(er) presubmits.The text was updated successfully, but these errors were encountered: