This is an automated email from the ASF dual-hosted git repository.
amaechler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git
The following commit(s) were added to refs/heads/master by this push:
new 7fa5f89280e ci: fix the review bypass, allow only squash merges,
delete merged branches (#20804)
7fa5f89280e is described below
commit 7fa5f89280e7ec7d521a7d51e1a882ce71ba4771
Author: Andreas Maechler <[email protected]>
AuthorDate: Fri Oct 30 12:35:15 2026 -0600
ci: fix the review bypass, allow only squash merges, delete merged branches
(#20804)
* Bypass the review ruleset with the Write role instead of a team
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.
* Allow only squash merges and delete branches after merge
---
.asf.yaml | 33 +++++++++++++++++++++++++++++----
1 file changed, 29 insertions(+), 4 deletions(-)
diff --git a/.asf.yaml b/.asf.yaml
index 140c4d20fec..bafcd3eb0be 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -4,6 +4,14 @@ github:
description: 'Apache Druid: a high performance real-time analytics database.'
homepage: https://druid.apache.org/
+ enabled_merge_buttons:
+ squash: true
+ merge: false
+ rebase: false
+
+ pull_requests:
+ del_branch_on_merge: true
+
rulesets:
- name: "Default Branch Protection"
branches:
@@ -13,11 +21,28 @@ github:
- "[0-9]*.[0-9]*.*"
bypass_teams:
- root
+ # Raw syntax, because GitHub refuses the secret druid-committers team as a
bypass actor.
+ # actor_id 4 is the Write repository role, which on this repository only
committers hold.
- name: "Require review"
- bypass_teams:
- - druid-committers
- required_pull_request_reviews:
- required_approving_review_count: 1
+ target: branch
+ enforcement: active
+ conditions:
+ ref_name:
+ include:
+ - "~DEFAULT_BRANCH"
+ exclude: []
+ bypass_actors:
+ - actor_id: 4
+ actor_type: RepositoryRole
+ bypass_mode: always
+ rules:
+ - type: pull_request
+ parameters:
+ required_approving_review_count: 1
+ dismiss_stale_reviews_on_push: false
+ require_code_owner_review: false
+ require_last_push_approval: false
+ required_review_thread_resolution: false
# Attempt to make the auto-generated github emails more easily readable in
email clients.
# Configuration adapted from
https://github.com/apache/plc4x/blob/develop/.asf.yaml.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
