amaechler opened a new pull request, #20804: URL: https://github.com/apache/druid/pull/20804
### Description Follow-up to #20796. ASF Infra created the `Default Branch Protection` ruleset, but GitHub refused the `Require review` ruleset: ``` Validation failed while creating ruleset 'Require review': ['Actor druid committers team must be part of the ruleset source or owner organization'] ``` GitHub doesn't accept a secret team as a bypass actor, and `druid-committers` is secret. The `.asf.yaml` convenience 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 its `airflow-committers` team. 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 the `apache/druid` repository 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 the `Default Branch Protection` ruleset. <hr> This PR has: - [x] been self-reviewed. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
