This is an automated email from the ASF dual-hosted git repository.

CalvinKirs pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git


The following commit(s) were added to refs/heads/master by this push:
     new 65f8692f4e8 Revert "[fix](build) Migrate branch protection to GitHub 
rulesets" (#70298)
65f8692f4e8 is described below

commit 65f8692f4e8c6b8e072f18e34bfe30fd471ead36
Author: Calvin Kirs <[email protected]>
AuthorDate: Thu Nov 5 21:20:48 2026 +0800

    Revert "[fix](build) Migrate branch protection to GitHub rulesets" (#70298)
    
    Reverts apache/doris#70274
    
    An error occurred while processing the github feature in .asf.yaml:
    
    Branch not protected: 404 {"message": "Branch not protected",
    "documentation_url":
    
"https://docs.github.com/rest/branches/branch-protection#delete-branch-protection";,
    "status": "404"}
---
 .asf.yaml | 298 +++++++++++++++++++++++++++-----------------------------------
 1 file changed, 129 insertions(+), 169 deletions(-)

diff --git a/.asf.yaml b/.asf.yaml
index a790c06cbbf..ca9e5e0c381 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -41,211 +41,171 @@ github:
     squash:  true
     merge:   false
     rebase:  false
-  rulesets:
-    - name: "Branch Protection: master"
-      type: branch
-      branches:
-        includes:
-          - master
-      restrict_deletion: true
-      restrict_force_push: true
-      required_status_checks_strict: false
+  protected_branches:
+    master:
       required_status_checks:
-        - License Check
-        - Check for secrets
-        - Clang Formatter
-        - CheckStyle
-        - P0 Regression (Doris Regression)
-        - NonConcurrent Regression (nonConcurrent)
-        - External Regression (Doris External Regression)
-        - cloud_p0 (Doris Cloud Regression)
-        - vault_p0 (Doris Cloud Regression)
-        - FE UT (Doris FE UT)
-        - BE UT (Doris BE UT)
-        - Build Third Party Libraries (Linux)
-        - Build Third Party Libraries (macOS)
-        - Build Third Party Libraries (macOS-arm64)
-        - COMPILE (DORIS_COMPILE)
-        - code-review
-        - Cloud UT (Doris Cloud UT)
-        - performance (Doris Performance)
+        strict: false
+        contexts:
+          - License Check
+          - Check for secrets
+          - Clang Formatter
+          - CheckStyle
+          - P0 Regression (Doris Regression)
+          - NonConcurrent Regression (nonConcurrent)
+          - External Regression (Doris External Regression)
+          - cloud_p0 (Doris Cloud Regression)
+          - vault_p0 (Doris Cloud Regression)
+          - FE UT (Doris FE UT)
+          - BE UT (Doris BE UT)
+          - Build Third Party Libraries (Linux)
+          - Build Third Party Libraries (macOS)
+          - Build Third Party Libraries (macOS-arm64)
+          - COMPILE (DORIS_COMPILE)
+          - code-review
+          - Cloud UT (Doris Cloud UT)
+          - performance (Doris Performance)
       required_pull_request_reviews:
         dismiss_stale_reviews: true
         require_code_owner_reviews: true
         required_approving_review_count: 1
-    - name: "Branch Protection: branch-4.2"
-      type: branch
-      branches:
-        includes:
-          - branch-4.2
-      restrict_deletion: true
-      restrict_force_push: true
-      required_status_checks_strict: false
+    branch-4.2:
       required_status_checks:
-        - License Check
-        - Clang Formatter
-        - CheckStyle
-        - Build Broker
-        - FE UT (Doris FE UT)
-        - BE UT (Doris BE UT)
-        - Cloud UT (Doris Cloud UT)
-        - COMPILE (DORIS_COMPILE)
-        - P0 Regression (Doris Regression)
-        - NonConcurrent Regression (nonConcurrent)
-        - External Regression (Doris External Regression)
-        - cloud_p0 (Doris Cloud Regression)
-        - vault_p0 (Doris Cloud Regression)
+        strict: false
+        contexts:
+          - License Check
+          - Clang Formatter
+          - CheckStyle
+          - Build Broker
+          - FE UT (Doris FE UT)
+          - BE UT (Doris BE UT)
+          - Cloud UT (Doris Cloud UT)
+          - COMPILE (DORIS_COMPILE)
+          - P0 Regression (Doris Regression)
+          - NonConcurrent Regression (nonConcurrent)
+          - External Regression (Doris External Regression)
+          - cloud_p0 (Doris Cloud Regression)
+          - vault_p0 (Doris Cloud Regression)
       required_pull_request_reviews:
         require_code_owner_reviews: true
         required_approving_review_count: 1
         dismiss_stale_reviews: true
-    - name: "Branch Protection: branch-4.1"
-      type: branch
-      branches:
-        includes:
-          - branch-4.1
-      restrict_deletion: true
-      restrict_force_push: true
-      required_status_checks_strict: false
+    branch-4.1:
       required_status_checks:
-        - License Check
-        - Clang Formatter
-        - CheckStyle
-        - Build Broker
-        - FE UT (Doris FE UT)
-        - BE UT (Doris BE UT)
-        - Cloud UT (Doris Cloud UT)
-        - COMPILE (DORIS_COMPILE)
-        - P0 Regression (Doris Regression)
-        - NonConcurrent Regression (nonConcurrent)
-        - External Regression (Doris External Regression)
-        - cloud_p0 (Doris Cloud Regression)
-        - vault_p0 (Doris Cloud Regression)
+        strict: false
+        contexts:
+          - License Check
+          - Clang Formatter
+          - CheckStyle
+          - Build Broker
+          - FE UT (Doris FE UT)
+          - BE UT (Doris BE UT)
+          - Cloud UT (Doris Cloud UT)
+          - COMPILE (DORIS_COMPILE)
+          - P0 Regression (Doris Regression)
+          - NonConcurrent Regression (nonConcurrent)
+          - External Regression (Doris External Regression) 
+          - cloud_p0 (Doris Cloud Regression)
+          - vault_p0 (Doris Cloud Regression)
       required_pull_request_reviews:
         require_code_owner_reviews: true
         required_approving_review_count: 1
         dismiss_stale_reviews: true
-    - name: "Branch Protection: branch-4.0"
-      type: branch
-      branches:
-        includes:
-          - branch-4.0
-      restrict_deletion: true
-      restrict_force_push: true
-      required_status_checks_strict: false
+    branch-4.0:
       required_status_checks:
-        - License Check
-        - Clang Formatter
-        - CheckStyle
-        - Build Broker
-        - FE UT (Doris FE UT)
-        - BE UT (Doris BE UT)
-        - Cloud UT (Doris Cloud UT)
-        - COMPILE (DORIS_COMPILE)
-        - P0 Regression (Doris Regression)
-        - NonConcurrent Regression (nonConcurrent)
-        - External Regression (Doris External Regression)
-        - cloud_p0 (Doris Cloud Regression)
-        - vault_p0 (Doris Cloud Regression)
+        strict: false
+        contexts:
+          - License Check
+          - Clang Formatter
+          - CheckStyle
+          - Build Broker
+          - FE UT (Doris FE UT)
+          - BE UT (Doris BE UT)
+          - Cloud UT (Doris Cloud UT)
+          - COMPILE (DORIS_COMPILE)
+          - P0 Regression (Doris Regression)
+          - NonConcurrent Regression (nonConcurrent)
+          - External Regression (Doris External Regression) 
+          - cloud_p0 (Doris Cloud Regression)
+          - vault_p0 (Doris Cloud Regression)
       required_pull_request_reviews:
         require_code_owner_reviews: true
         required_approving_review_count: 1
         dismiss_stale_reviews: true
-    - name: "Branch Protection: branch-3.1"
-      type: branch
-      branches:
-        includes:
-          - branch-3.1
-      restrict_deletion: true
-      restrict_force_push: true
-      required_status_checks_strict: false
+    branch-3.1:
       required_status_checks:
-        - License Check
-        - Clang Formatter
-        - CheckStyle
-        - Build Broker
-        - Build Third Party Libraries (Linux)
-        - FE UT (Doris FE UT)
-        - BE UT (Doris BE UT)
-        - Cloud UT (Doris Cloud UT)
-        - COMPILE (DORIS_COMPILE)
-        - P0 Regression (Doris Regression)
-        - NonConcurrent Regression (nonConcurrent)
-        - External Regression (Doris External Regression)
-        - cloud_p0 (Doris Cloud Regression)
-        - vault_p0 (Doris Cloud Regression)
+        strict: false
+        contexts:
+          - License Check
+          - Clang Formatter
+          - CheckStyle
+          - Build Broker
+          - Build Third Party Libraries (Linux)
+          - FE UT (Doris FE UT)
+          - BE UT (Doris BE UT)
+          - Cloud UT (Doris Cloud UT)
+          - COMPILE (DORIS_COMPILE)
+          - P0 Regression (Doris Regression)
+          - NonConcurrent Regression (nonConcurrent)
+          - External Regression (Doris External Regression) 
+          - cloud_p0 (Doris Cloud Regression)
+          - vault_p0 (Doris Cloud Regression)
       required_pull_request_reviews:
         require_code_owner_reviews: true
         required_approving_review_count: 1
         dismiss_stale_reviews: true
-    - name: "Branch Protection: branch-3.0"
-      type: branch
-      branches:
-        includes:
-          - branch-3.0
-      restrict_deletion: true
-      restrict_force_push: true
-      required_status_checks_strict: false
+    branch-3.0:
       required_status_checks:
-        - License Check
-        - Clang Formatter
-        - CheckStyle
-        - Build Broker
-        - Build Third Party Libraries (Linux)
-        - FE UT (Doris FE UT)
-        - BE UT (Doris BE UT)
-        - Cloud UT (Doris Cloud UT)
-        - COMPILE (DORIS_COMPILE)
-        - P0 Regression (Doris Regression)
-        - NonConcurrent Regression (nonConcurrent)
-        - External Regression (Doris External Regression)
-        - cloud_p0 (Doris Cloud Regression)
-        - vault_p0 (Doris Cloud Regression)
+        strict: false
+        contexts:
+          - License Check
+          - Clang Formatter
+          - CheckStyle
+          - Build Broker
+          - Build Third Party Libraries (Linux)
+          - FE UT (Doris FE UT)
+          - BE UT (Doris BE UT)
+          - Cloud UT (Doris Cloud UT)
+          - COMPILE (DORIS_COMPILE)
+          - P0 Regression (Doris Regression)
+          - NonConcurrent Regression (nonConcurrent)
+          - External Regression (Doris External Regression)
+          - cloud_p0 (Doris Cloud Regression)
+          - vault_p0 (Doris Cloud Regression)
       required_pull_request_reviews:
         require_code_owner_reviews: true
         required_approving_review_count: 1
         dismiss_stale_reviews: true
-    - name: "Branch Protection: branch-2.1"
-      type: branch
-      branches:
-        includes:
-          - branch-2.1
-      restrict_deletion: true
-      restrict_force_push: true
-      required_status_checks_strict: false
+    branch-2.1:
       required_status_checks:
-        - License Check
-        - CheckStyle
-        - Build Broker
-        - Build Third Party Libraries (Linux)
-        - COMPILE (DORIS_COMPILE)
-        - External Regression (Doris External Regression)
-        - FE UT (Doris FE UT)
-        - BE UT (Doris BE UT)
-        - P0 Regression (Doris Regression)
+        strict: false
+        contexts:
+          - License Check
+          - CheckStyle
+          - Build Broker
+          - Build Third Party Libraries (Linux)
+          - COMPILE (DORIS_COMPILE)
+          - External Regression (Doris External Regression)
+          - FE UT (Doris FE UT)
+          - BE UT (Doris BE UT)
+          - P0 Regression (Doris Regression)
       required_pull_request_reviews:
         require_code_owner_reviews: true
         required_approving_review_count: 1
         dismiss_stale_reviews: true
-    - name: "Branch Protection: branch-2.0"
-      type: branch
-      branches:
-        includes:
-          - branch-2.0
-      restrict_deletion: true
-      restrict_force_push: true
-      required_status_checks_strict: false
+    branch-2.0:
       required_status_checks:
-        - License Check
-        - CheckStyle
-        - P0 Regression (Doris Regression)
-        - External Regression (Doris External Regression)
-        - FE UT (Doris FE UT)
-        - BE UT (Doris BE UT)
-        - Build Broker
-        - Build Third Party Libraries (Linux)
-        - Build Third Party Libraries (macOS)
-        - COMPILE (DORIS_COMPILE)
+        strict: false
+        contexts:
+          - License Check
+          - CheckStyle
+          - P0 Regression (Doris Regression)
+          - External Regression (Doris External Regression)
+          - FE UT (Doris FE UT)
+          - BE UT (Doris BE UT)
+          - Build Broker
+          - Build Third Party Libraries (Linux)
+          - Build Third Party Libraries (macOS)
+          - COMPILE (DORIS_COMPILE)
       required_pull_request_reviews:
         dismiss_stale_reviews: true
         required_approving_review_count: 1


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to