Repository navigation
ci: fix the review bypass, allow only squash merges, delete merged branches - #20804
Merged
amaechler merged 2 commits intoOct 30, 2026
Merged
Conversation
GitHub refused to create the "Require review" ruleset because the druid-committers team is secret. Use the raw ruleset syntax, as apache/airflow does, with the Write repository role as the bypass actor.
gianm
approved these changes
Oct 30, 2026
1 task done
This was referenced Nov 1, 2026
1 task done
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.
Description
Follow-up to #20796. ASF Infra created the
Default Branch Protectionruleset, but GitHub refused theRequire reviewruleset:GitHub doesn't accept a secret team as a bypass actor, and
druid-committersis secret. The.asf.yamlconvenience syntax can only name teams, so this PR switches the ruleset to the raw Rulesets API syntax and uses the Write repository role (actor_id: 4) as the bypass actor instead. On this repository only committers hold the Write role, granted by ASF Infra, so it needs no update when committers change. apache/airflow uses the same workaround for itsairflow-committersteam.The rule itself is unchanged: one approving review on
master, which committers can explicitly bypass.Allow only squash merges
Disables the rebase button, so squash is the only way to merge a PR. Merge commits are already disabled. Our contributing guide already expects committers to squash PRs into a single commit. The existing squash commit title and message settings stay as they are.
Delete branches after merge
Turns on
del_branch_on_merge, so a branch in theapache/druidrepository is deleted once its PR merges. This mostly affects backport and Dependabot branches; branches in contributors' forks aren't touched. Release branches are protected from deletion by theDefault Branch Protectionruleset.This PR has: