From 130e99ce73ac810e098cad695a0ab78924c17e4c Mon Sep 17 00:00:00 2001 From: The Apache Software Foundation Date: Fri, 15 May 2026 17:38:28 -0500 Subject: [PATCH 1/2] Set up default protection ruleset for default and release branches --- .asf.yaml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/.asf.yaml b/.asf.yaml index 6373e2bc..33ebc904 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -37,10 +37,23 @@ github: discussions: true wiki: false projects: false - protected_branches: ~ + protected_branches: collaborators: - Xuanwo + rulesets: + - name: "Default Branch Protection" + type: branch + branches: + includes: + - "~DEFAULT_BRANCH" + - "release/*" + - "rel/*" + excludes: [] + bypass_teams: + - root + restrict_deletion: true + restrict_force_push: true notifications: commits: commits@paimon.apache.org issues: issues@paimon.apache.org From 0ec6daafc76f69971443b278113ef6bd9c2e19c5 Mon Sep 17 00:00:00 2001 From: JingsongLi Date: Tue, 2 Jun 2026 10:05:42 +0800 Subject: [PATCH 2/2] ci: allow ASF GitHub rulesets config --- scripts/validate_asf_yaml.py | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/validate_asf_yaml.py b/scripts/validate_asf_yaml.py index c5534e7c..2a80e84f 100644 --- a/scripts/validate_asf_yaml.py +++ b/scripts/validate_asf_yaml.py @@ -43,6 +43,7 @@ "features", "enabled_merge_buttons", "protected_branches", + "rulesets", "collaborators", "autolinks", "environments",