Skip to content

Commit 824e921

Browse files
authored
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
1 parent ea71fc3 commit 824e921

File tree

1 file changed

+19
-4
lines changed

1 file changed

+19
-4
lines changed

.asf.yaml

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#
1717

1818
# `.asf.yaml` is a branch-specific YAML configuration file for Git repositories to control features such as notifications, GitHub settings, etc.
19-
# See its documentation for details: https://cwiki.apache.org/confluence/display/INFRA/Git+-+.asf.yaml+features
19+
# See its documentation for details: https://github.com/apache/infrastructure-asfyaml
2020

2121
# Bare minimum `notifications` to
2222
#
@@ -63,8 +63,23 @@ github:
6363
merge: false
6464
rebase: false
6565

66+
# Enforce Review-then-Commit
6667
protected_branches:
67-
main:
68-
required_signatures: true
69-
2.x:
68+
2.x: &default_protection
69+
# All commits must be signed
7070
required_signatures: true
71+
# All reviews must be addressed before merging
72+
required_conversation_resolution: true
73+
# Require checks to pass before merging
74+
required_status_checks:
75+
checks:
76+
# The GitHub Actions app
77+
- app_id: ~
78+
check: "build"
79+
- app_id: ~
80+
check: "codeql-analysis"
81+
# At least one positive review must be present
82+
required_pull_request_reviews:
83+
required_approving_review_count: 1
84+
main:
85+
*default_protection

0 commit comments

Comments
 (0)