From 9a8740d8868e67286fc09554590a442a94078fb6 Mon Sep 17 00:00:00 2001
From: Abhishek Choudhary <shreemaan.abhishek@gmail.com>
Date: Wed, 16 Sep 2026 14:16:58 +0545
Subject: [PATCH 1/2] chore: migrate branch protection to rulesets

---
 .asf.yaml | 124 +++++-------------------------------------------------
 1 file changed, 10 insertions(+), 114 deletions(-)

diff --git a/.asf.yaml b/.asf.yaml
index 13ff885629cf..7d82391f032d 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -46,124 +46,20 @@ github:
     rebase:  true
     merge:   false
   
-  protected_branches:
-    master:
+  rulesets:
+    - name: APISIX branch protection
+      type: branch
+      branches:
+        includes:
+          - master
+          - release/*
+        excludes: []
+      restrict_deletion: true
+      restrict_force_push: true
       required_pull_request_reviews:
         dismiss_stale_reviews: true
         require_code_owner_reviews: true
         required_approving_review_count: 3
-    release/3.14:
-      required_pull_request_reviews:
-        require_code_owner_reviews: true
-        required_approving_review_count: 3
-    release/3.13:
-      required_pull_request_reviews:
-        require_code_owner_reviews: true
-        required_approving_review_count: 3
-    release/3.12:
-      required_pull_request_reviews:
-        require_code_owner_reviews: true
-        required_approving_review_count: 3
-    release/3.11:
-      required_pull_request_reviews:
-        require_code_owner_reviews: true
-        required_approving_review_count: 3
-    release/3.10:
-      required_pull_request_reviews:
-        require_code_owner_reviews: true
-        required_approving_review_count: 3
-    release/3.9:
-      required_pull_request_reviews:
-        require_code_owner_reviews: true
-        required_approving_review_count: 2
-    release/3.8:
-      required_pull_request_reviews:
-        require_code_owner_reviews: true
-        required_approving_review_count: 2
-    release/3.7:
-      required_pull_request_reviews:
-        require_code_owner_reviews: true
-        required_approving_review_count: 2
-    release/3.6:
-      required_pull_request_reviews:
-        require_code_owner_reviews: true
-        required_approving_review_count: 2
-    release/3.5:
-      required_pull_request_reviews:
-        require_code_owner_reviews: true
-        required_approving_review_count: 2
-    release/3.4:
-      required_pull_request_reviews:
-        require_code_owner_reviews: true
-        required_approving_review_count: 2
-    release/3.3:
-      required_pull_request_reviews:
-        require_code_owner_reviews: true
-        required_approving_review_count: 2
-    release/3.2:
-      required_pull_request_reviews:
-        require_code_owner_reviews: true
-        required_approving_review_count: 2
-    release/3.1:
-      required_pull_request_reviews:
-        require_code_owner_reviews: true
-        required_approving_review_count: 2
-    release/3.0:
-      required_pull_request_reviews:
-        require_code_owner_reviews: true
-        required_approving_review_count: 2
-    release/2.99:
-      required_pull_request_reviews:
-        require_code_owner_reviews: true
-        required_approving_review_count: 2
-    release/2.15:
-      required_pull_request_reviews:
-        require_code_owner_reviews: true
-        required_approving_review_count: 2
-    release/2.14:
-      required_pull_request_reviews:
-        require_code_owner_reviews: true
-        required_approving_review_count: 2
-    release/2.13:
-      required_pull_request_reviews:
-        require_code_owner_reviews: true
-        required_approving_review_count: 2
-    release/2.12:
-      required_pull_request_reviews:
-        require_code_owner_reviews: true
-        required_approving_review_count: 2
-    release/2.11:
-      required_pull_request_reviews:
-        require_code_owner_reviews: true
-        required_approving_review_count: 2
-    release/2.10:
-      required_pull_request_reviews:
-        require_code_owner_reviews: true
-        required_approving_review_count: 2
-    release/2.9:
-      required_pull_request_reviews:
-        require_code_owner_reviews: true
-        required_approving_review_count: 2
-    release/2.8:
-      required_pull_request_reviews:
-        require_code_owner_reviews: true
-        required_approving_review_count: 2
-    release/2.7:
-      required_pull_request_reviews:
-        require_code_owner_reviews: true
-        required_approving_review_count: 2
-    release/2.6:
-      required_pull_request_reviews:
-        require_code_owner_reviews: true
-        required_approving_review_count: 2
-    release/2.5:
-      required_pull_request_reviews:
-        require_code_owner_reviews: true
-        required_approving_review_count: 2
-    release/2.4:
-      required_pull_request_reviews:
-        require_code_owner_reviews: true
-        required_approving_review_count: 2
 
 notifications:
   commits:      notifications@apisix.apache.org

From 6b228a472d725fb7d69c0bc1459075694341907c Mon Sep 17 00:00:00 2001
From: Abhishek Choudhary <shreemaan.abhishek@gmail.com>
Date: Tue, 29 Sep 2026 10:51:57 +0545
Subject: [PATCH 2/2] chore: allow root team to bypass ruleset

---
 .asf.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.asf.yaml b/.asf.yaml
index 7d82391f032d..d53f2ad63bb1 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -54,6 +54,8 @@ github:
           - master
           - release/*
         excludes: []
+      bypass_teams:
+        - root
       restrict_deletion: true
       restrict_force_push: true
       required_pull_request_reviews: