Repository navigation
Require a review on pull requests and allow auto-merge - #303
Merged
Merged
Conversation
The .asf.yaml rulesets for master and roller-6.1.x now require one approving review and the CI checks before a pull request can merge, which lets GitHub's auto-merge be turned on. Merged branches are deleted automatically.
snoopdave
approved these changes
Nov 17, 2026
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.
Committers can't change these repository settings in GitHub, so this sets them in
.asf.yaml:pull_requests.allow_auto_mergeturns on GitHub's auto-merge.pull_requests.del_branch_on_mergedeletes a pull request's branch once it's merged.require_last_push_approval), and the CI checks: Build+Test on JDK 21 and 25, License headers, the three UI test jobs, and CodeQL for Java and JavaScript.roller-6.1.xdoes the same with that branch's checks (Build+Test on JDK 11, 17, 21 and 25, and CodeQL), so its pull requests can't auto-merge without a review either.The checks are required because auto-merge only waits for required checks; with a review alone, a pull request would merge as soon as it's approved, while CI is still running. A pull request author's own approval doesn't count, and a push after the approval needs a new one, so each merge needs another committer's review of what actually merges. Auto-merge counts only "Approve" reviews, not comments.
If a check is renamed in a workflow, it has to be renamed here as well, or pull requests will wait for a check that never reports.