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

pkarwasz pushed a commit to branch feature/rtc
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git

commit a068286ef1aa3883c88f4f73c098e7a19521559a
Author: Piotr P. Karwasz <[email protected]>
AuthorDate: Tue Apr 1 14:18:48 2025 +0200

    Enforce RTC style on `logging-log4j2`
    
    Following the [PMC discussion in September 
2024](https://lists.apache.org/thread/6gbos0rn3k4y3wjb1hcgnnols4ogqckl), this 
PR changes the branch protection rules for the `logging-log4j2` repository:
    
    - It requires all changes to `2.x` and `main` to be submitted as PRs.
    - It requires all PRs to have at least one positive review to be merged.
    - It requires all conversations to be marked as resolved, before a PR is 
merged.
    
    The current features offered by GitHub do not allow introducing exceptions 
on the size of the PR or other criteria, so let's try to review 100% of the 
PRs. Smaller teams manage to do it, so we should be able too.
---
 .asf.yaml | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/.asf.yaml b/.asf.yaml
index e8e37f6d72..97124c363b 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -16,7 +16,7 @@
 #
 
 # `.asf.yaml` is a branch-specific YAML configuration file for Git 
repositories to control features such as notifications, GitHub settings, etc.
-# See its documentation for details: 
https://cwiki.apache.org/confluence/display/INFRA/Git+-+.asf.yaml+features
+# See its documentation for details: 
https://github.com/apache/infrastructure-asfyaml
 
 # Bare minimum `notifications` to
 #
@@ -63,8 +63,17 @@ github:
     merge:   false
     rebase:  false
 
+  # Enforce Review-then-Commit
   protected_branches:
-    main:
-      required_signatures: true
-    2.x:
+    2.x: &default_protection
+      # All reviews must be addressed before merging
+      required_conversation_resolution: true
+      # Use "Squash and merge" or equivalent
+      required_linear_history: true
+      # All commits must be signed
       required_signatures: true
+      # At least one positive review must be present
+      required_pull_request_reviews:
+        required_approving_review_count: 1
+    main:
+      *default_protection

Reply via email to