From 564e6b242f46d8994a80ff3f57738d71ee0f25d9 Mon Sep 17 00:00:00 2001 From: Sandra Parsick Date: Wed, 13 Aug 2025 14:14:05 +0200 Subject: [PATCH 1/2] feat: enable prevent branch protection rules also: - refactor deprecated config Signed-off-by: Sandra Parsick --- .asf.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.asf.yaml b/.asf.yaml index 3a29b667c9..e707a4fa70 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -31,7 +31,11 @@ github: squash: true merge: false rebase: true - del_branch_on_merge: true + protected_branches: + master: { } + surefire-3.4.x: { } + pull_requests: + del_branch_on_merge: true features: issues: true notifications: From 9c289984b5589ab5bb8f28380684574ccd7bd2ba Mon Sep 17 00:00:00 2001 From: Sandra Parsick Date: Thu, 14 Aug 2025 07:32:02 +0200 Subject: [PATCH 2/2] fix: remove 3.4.x branch Code review Feedback Signed-off-by: Sandra Parsick --- .asf.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.asf.yaml b/.asf.yaml index e707a4fa70..f3ee13e137 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -33,7 +33,6 @@ github: rebase: true protected_branches: master: { } - surefire-3.4.x: { } pull_requests: del_branch_on_merge: true features: