This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-parent.git
The following commit(s) were added to refs/heads/main by this push:
new 59262d0 Restore Branch Protection rules (#471)
59262d0 is described below
commit 59262d0380b3bc7da84a92b238a0051696f84da3
Author: Piotr P. Karwasz <[email protected]>
AuthorDate: Sat May 2 19:49:25 2026 +0200
Restore Branch Protection rules (#471)
Co-authored-by: Volkan Yazıcı <[email protected]>
---
.asf.yaml | 56 ++++++++++++++++++++++----------------------------------
1 file changed, 22 insertions(+), 34 deletions(-)
diff --git a/.asf.yaml b/.asf.yaml
index 31588c7..6a6eb53 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -18,13 +18,6 @@
# `.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://github.com/apache/infrastructure-asfyaml
-#
-# Additional non-standard features
-#
-meta:
- environments:
- - github_rulesets
-
# Bare minimum `notifications` to
#
# 1. Forward GitHub _activity_ to `notifications@`
@@ -68,37 +61,32 @@ github:
features:
issues: true
- # Clear Protected Branches configuration: it is replaced by GitHub Rulesets
- protected_branches: { }
-
- rulesets:
- # The `.asf.yaml` processor has a bug that prevents it from parsing
existing rulesets.
- # So it can neither remove them nor modify them.
- # Hence, we bump the counter in the name at each change.
- # For details, see:
https://github.com/apache/infrastructure-asfyaml/pull/93
- - name: "Branch protection (3)"
- type: branch
- branches:
- includes:
- - "~DEFAULT_BRANCH"
- - "refs/heads/gha/*"
+ # Prevent force pushes to primary branches
+ protected_branches:
+ main:
+ # 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: 15368
+ - app_id: 15368
+ context: "build / build (ubuntu-latest)"
+ # The GitHub Advanced Security app: 57789
+ - app_id: 57789
+ context: "CodeQL"
+ # At least one positive review must be present
+ required_pull_request_reviews:
+ required_approving_review_count: 1
+ gha/v0:
# All reviews must be addressed before merging
required_conversation_resolution: true
# Require checks to pass before merging
required_status_checks:
- # The GitHub Actions app
- # https://api.github.com/apps/github-actions
- - app_slug: 15368
- name: "build / build (ubuntu-latest)"
- # The GitHub Advanced Security app
- # https://api.github.com/apps/github-advanced-security
- - app_slug: 57789
- name: "CodeQL"
+ checks:
+ # The GitHub Advanced Security app: 57789
+ - app_id: 57789
+ context: "CodeQL"
# At least one positive review must be present
required_pull_request_reviews:
required_approving_review_count: 1
- - name: "Tag protection"
- type: tag
- branches:
- includes:
- - "refs/tags/rel/*"
