This is an automated email from the ASF dual-hosted git repository.
rgoers pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/logging-flume.git
The following commit(s) were added to refs/heads/trunk by this push:
new 409eebe4e Add branch protection rulesets (#428)
409eebe4e is described below
commit 409eebe4e2e3c241b38d423d8b907dbbdb9c9e83
Author: Piotr P. Karwasz <[email protected]>
AuthorDate: Wed May 27 02:19:48 2026 +0200
Add branch protection rulesets (#428)
* Add branch protection rulesets
Adds branch protection rulesets, similar to other Logging repos:
- One approval is required for the merge,
- The `ubuntu-latest` build must succeed.
* fix: change required reviews to 0
---
.asf.yaml | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 file changed, 62 insertions(+), 5 deletions(-)
diff --git a/.asf.yaml b/.asf.yaml
index 6f32cadd8..a952b62ac 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -24,9 +24,6 @@ notifications:
github:
description: "Apache Flume is a distributed, reliable, and available service
for efficiently collecting, aggregating, and moving large amounts of log-like
data"
homepage: https://flume.apache.org/
- features:
- issues: true
- del_branch_on_merge: true
autolink_jira:
- FLUME
labels:
@@ -36,5 +33,65 @@ github:
- jvm
- library
- flume
- protected_branches:
- main: {}
+
+ # Pull Request settings:
+ # https://github.com/apache/infrastructure-asfyaml#pull-request-settings
+ pull_requests:
+ # allow auto-merge
+ allow_auto_merge: true
+ # enable updating head branches of pull requests
+ allow_update_branch: true
+ # auto-delete head branches after being merged
+ del_branch_on_merge: true
+
+ # Enforce squashing while merging PRs.
+ # Otherwise, the git log gets polluted severely.
+ enabled_merge_buttons:
+ squash: true
+ merge: false
+ rebase: false
+
+ features:
+ issues: true
+
+ # Disable protected branches, since we use rulesets now
+ protected_branches: ~
+
+ rulesets:
+ - name: "Branch protection"
+ type: branch
+ branches:
+ includes:
+ - "~DEFAULT_BRANCH"
+ # All reviews must be addressed before merging
+ required_conversation_resolution: true
+ # Require checks to pass before merging
+ required_status_checks:
+ # The GitHub Actions app
+ - app_slug: github-actions
+ name: "build (ubuntu-latest)"
+ # The GitHub Advanced Security app
+ - app_slug: github-advanced-security
+ name: "CodeQL"
+ # At least one positive review must be present
+ required_pull_request_reviews:
+ required_approving_review_count: 0
+ # Use raw rules, until a convenience notation for `restrict_update` is
introduced.
+ # See: https://github.com/apache/infrastructure-asfyaml/issues/96
+ #
+ # The raw rules need to follow the syntax given in:
+ #
https://docs.github.com/en/rest/repos/rules?apiVersion=2026-03-10#update-a-repository-ruleset
+ - name: "Tag protection"
+ target: tag
+ enforcement: active
+ bypass_actors: []
+ conditions:
+ ref_name:
+ include:
+ - "refs/tags/rel/*"
+ exclude: []
+ rules:
+ - type: deletion
+ - type: non_fast_forward
+ - type: update
+
