From b1ab0415fdb2391ab17de180f1bf6f42556aca12 Mon Sep 17 00:00:00 2001
From: Yicong Huang <17627829+Yicong-Huang@users.noreply.github.com>
Date: Thu, 30 Apr 2026 12:03:49 -0700
Subject: [PATCH 1/3] ci: protect future release branches via ASF rulesets

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

diff --git a/.asf.yaml b/.asf.yaml
index 9423b186479..f447c512540 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -59,6 +59,22 @@ github:
     squash_commit_message: PR_TITLE_AND_DESC
     merge:   false
     rebase:  false
+
+  rulesets:
+    - name: Release Branch Protection
+      type: branch
+      branches:
+        includes:
+          - release/*
+        excludes: []
+      restrict_deletion: true
+      restrict_force_push: true
+      required_linear_history: true
+      required_pull_request_reviews:
+        dismiss_stale_reviews: false
+        require_last_push_approval: false
+        require_code_owner_reviews: false
+        required_approving_review_count: 1
     
   protected_branches:
     main:

From 4a242b676c8ffc7fae2d88139fff8f6464c55e61 Mon Sep 17 00:00:00 2001
From: Yicong Huang <17627829+Yicong-Huang@users.noreply.github.com>
Date: Thu, 30 Apr 2026 13:14:40 -0700
Subject: [PATCH 2/3] ci: require main CI checks on future release branches

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

diff --git a/.asf.yaml b/.asf.yaml
index f447c512540..57783491298 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -70,6 +70,19 @@ github:
       restrict_deletion: true
       restrict_force_push: true
       required_linear_history: true
+      required_status_checks:
+        strict: true
+        contexts:
+          - frontend (ubuntu-latest, 18)
+          - frontend (windows-latest, 18)
+          - frontend (macos-latest, 18)
+          - scala (ubuntu-22.04, 11)
+          - python (ubuntu-latest, 3.10)
+          - python (ubuntu-latest, 3.11)
+          - python (ubuntu-latest, 3.12)
+          - python (ubuntu-latest, 3.13)
+          - Check License Headers
+          - Validate PR title
       required_pull_request_reviews:
         dismiss_stale_reviews: false
         require_last_push_approval: false
@@ -90,7 +103,6 @@ github:
           - python (ubuntu-latest, 3.10)
           - python (ubuntu-latest, 3.11)
           - python (ubuntu-latest, 3.12)
-          - python (ubuntu-latest, 3.13)
           - Check License Headers
           - Validate PR title
       required_pull_request_reviews:
@@ -103,5 +115,5 @@ notifications:
   commits:              commits@texera.apache.org
   issues:               notifications@texera.apache.org
   pullrequests:         notifications@texera.apache.org
-  discussions:          dev@texera.apache.org
+  discussions:          notifications@texera.apache.org
   jobs:                 commits@texera.apache.org

From 5ac0fd0d23a40c8398cab7405dd1f3f1e698dfce Mon Sep 17 00:00:00 2001
From: Yicong Huang <17627829+Yicong-Huang@users.noreply.github.com>
Date: Thu, 30 Apr 2026 13:20:09 -0700
Subject: [PATCH 3/3] ci: keep release ruleset change isolated

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

diff --git a/.asf.yaml b/.asf.yaml
index 57783491298..00cd7b10894 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -103,6 +103,7 @@ github:
           - python (ubuntu-latest, 3.10)
           - python (ubuntu-latest, 3.11)
           - python (ubuntu-latest, 3.12)
+          - python (ubuntu-latest, 3.13)
           - Check License Headers
           - Validate PR title
       required_pull_request_reviews:
@@ -115,5 +116,5 @@ notifications:
   commits:              commits@texera.apache.org
   issues:               notifications@texera.apache.org
   pullrequests:         notifications@texera.apache.org
-  discussions:          notifications@texera.apache.org
+  discussions:          dev@texera.apache.org
   jobs:                 commits@texera.apache.org