From c312b993b429dcb98496fb05d27a97d3103f312e Mon Sep 17 00:00:00 2001 From: Dave Fisher Date: Tue, 31 Mar 2026 08:19:38 -0700 Subject: [PATCH 1/7] Add protected branches configuration for main branch Signed-off-by: Dave Fisher --- .asf.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.asf.yaml b/.asf.yaml index 90f3212a..f5fb7198 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -20,6 +20,8 @@ github: del_branch_on_merge: true features: issues: true + protected_branches: + main: {} notifications: commits: commits@infra.apache.org From de10bdc63fcd44f6e38586e9eb5b7e0e8cbb02ec Mon Sep 17 00:00:00 2001 From: Dave Fisher Date: Wed, 1 Apr 2026 15:50:05 -0700 Subject: [PATCH 2/7] Update main branch settings in .asf.yaml Add required status checks and pull request review settings for the main branch. Signed-off-by: Dave Fisher --- .asf.yaml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.asf.yaml b/.asf.yaml index f5fb7198..9f25c518 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -21,7 +21,14 @@ github: features: issues: true protected_branches: - main: {} + main: + required_status_checks: + # strict means "Require branches to be up to date before merging". + strict: false + required_pull_request_reviews: + dismiss_stale_reviews: false + require_code_owner_reviews: true + required_approving_review_count: 1 notifications: commits: commits@infra.apache.org From 5b109c31370926dbf82f1947c2eeb493351aea55 Mon Sep 17 00:00:00 2001 From: Dave Fisher Date: Thu, 2 Apr 2026 06:07:24 -0700 Subject: [PATCH 3/7] Remove requirement for code owner reviews Signed-off-by: Dave Fisher --- .asf.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.asf.yaml b/.asf.yaml index 9f25c518..79c2452c 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -27,7 +27,6 @@ github: strict: false required_pull_request_reviews: dismiss_stale_reviews: false - require_code_owner_reviews: true required_approving_review_count: 1 notifications: From 1faf75d70bc25094e055314f17ae6a44c4a7ca91 Mon Sep 17 00:00:00 2001 From: Dave Fisher Date: Sat, 4 Apr 2026 12:25:26 -0700 Subject: [PATCH 4/7] Add bypass_pull_request_allowances for asfgit Signed-off-by: Dave Fisher --- .asf.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.asf.yaml b/.asf.yaml index 79c2452c..9d3a44ba 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -28,7 +28,9 @@ github: required_pull_request_reviews: dismiss_stale_reviews: false required_approving_review_count: 1 - + bypass_pull_request_allowances: + users: + - asfgit notifications: commits: commits@infra.apache.org issues: issues@infra.apache.org From dfc02a573ba809edbacd6f16e70074f02865277e Mon Sep 17 00:00:00 2001 From: Dave Fisher Date: Sat, 4 Apr 2026 12:45:01 -0700 Subject: [PATCH 5/7] Revert "Add bypass_pull_request_allowances for asfgit" This reverts commit 1faf75d70bc25094e055314f17ae6a44c4a7ca91. --- .asf.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.asf.yaml b/.asf.yaml index 9d3a44ba..79c2452c 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -28,9 +28,7 @@ github: required_pull_request_reviews: dismiss_stale_reviews: false required_approving_review_count: 1 - bypass_pull_request_allowances: - users: - - asfgit + notifications: commits: commits@infra.apache.org issues: issues@infra.apache.org From a4315b3d8d9f4ce6a566a8547126c6aaf8b61a0b Mon Sep 17 00:00:00 2001 From: Dave Fisher Date: Sat, 4 Apr 2026 12:47:06 -0700 Subject: [PATCH 6/7] Try bypass_pull_request_allowances again --- .asf.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.asf.yaml b/.asf.yaml index 79c2452c..daed9eaa 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -28,6 +28,9 @@ github: required_pull_request_reviews: dismiss_stale_reviews: false required_approving_review_count: 1 + bypass_pull_request_allowances: + users: + - asfgit notifications: commits: commits@infra.apache.org From db0765d67ee7d7a648c0534dd8628c0001b29cc4 Mon Sep 17 00:00:00 2001 From: Dave Fisher Date: Sat, 4 Apr 2026 12:51:05 -0700 Subject: [PATCH 7/7] Comment out the bypass. --- .asf.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.asf.yaml b/.asf.yaml index daed9eaa..1b565826 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -28,9 +28,9 @@ github: required_pull_request_reviews: dismiss_stale_reviews: false required_approving_review_count: 1 - bypass_pull_request_allowances: - users: - - asfgit + #bypass_pull_request_allowances: + # users: + # - asfgit notifications: commits: commits@infra.apache.org