From e0e1864e76b0cec2f9327adf70528e6b723a43a7 Mon Sep 17 00:00:00 2001 From: The Apache Software Foundation Date: Fri, 15 May 2026 16:08:06 -0500 Subject: [PATCH 1/2] Set up default protection ruleset for default and release branches --- .asf.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.asf.yaml b/.asf.yaml index 0d12d57..bee4edc 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -38,6 +38,19 @@ github: - github-actions - github - apache + 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@grails.apache.org jobs: notifications@grails.apache.org From 0b54bb0bed79f2401d38c228b64b9654bc7e75df Mon Sep 17 00:00:00 2001 From: James Fredley Date: Thu, 28 May 2026 23:04:28 -0400 Subject: [PATCH 2/2] [INFRA] Use Grails *.x version branch pattern for branch protection Replace the generic release/* and rel/* include patterns (which match no branches in Grails repositories) with *.x, the naming convention Grails uses for maintenance/version branches (e.g. 7.0.x, 8.0.x). Assisted-by: claude-code:claude-4.8-opus --- .asf.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.asf.yaml b/.asf.yaml index bee4edc..6f3007d 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -44,8 +44,7 @@ github: branches: includes: - "~DEFAULT_BRANCH" - - "release/*" - - "rel/*" + - "*.x" excludes: [] bypass_teams: - root