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

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


The following commit(s) were added to refs/heads/2.x by this push:
     new 824e921c09 Enforce RTC style on `logging-log4j2` (#3582)
824e921c09 is described below

commit 824e921c09e4ff1e2f9fb729369e485484917d18
Author: Piotr P. Karwasz <pkarwasz-git...@apache.org>
AuthorDate: Fri Apr 11 11:25:22 2025 +0200

    Enforce RTC style on `logging-log4j2` (#3582)
    
    * 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.
    
    * Adapt to PMC vote
    
    * Add CodeQL required check
---
 .asf.yaml | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/.asf.yaml b/.asf.yaml
index e8e37f6d72..dfb9f02849 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,23 @@ github:
     merge:   false
     rebase:  false
 
+  # Enforce Review-then-Commit
   protected_branches:
-    main:
-      required_signatures: true
-    2.x:
+    2.x: &default_protection
+      # All commits must be signed
       required_signatures: true
+      # All reviews must be addressed before merging
+      required_conversation_resolution: true
+      # Require checks to pass before merging
+      required_status_checks:
+        checks:
+          # The GitHub Actions app
+          - app_id: ~
+            check: "build"
+          - app_id: ~
+            check: "codeql-analysis"
+      # At least one positive review must be present
+      required_pull_request_reviews:
+        required_approving_review_count: 1
+    main:
+      *default_protection

Reply via email to