Skip to content

Restore Branch Protection rules - #471

Merged
vy merged 3 commits into
mainfrom
feat/branch-protection
May 2, 2026
Merged

Restore Branch Protection rules#471
vy merged 3 commits into
mainfrom
feat/branch-protection

Conversation

@ppkarwasz

Copy link
Copy Markdown
Member

This change restores branch protection rules on main using 6286ddc and adds rules to gha/v0.

This change restores branch protection rules on `main` using 6286ddc and adds rules to `gha/v0`.
@ppkarwasz
ppkarwasz marked this pull request as draft April 30, 2026 21:07
@ppkarwasz

Copy link
Copy Markdown
MemberAuthor

Converting to draft, since we need to see the Java build run before we consider merging it.

@ppkarwasz
ppkarwasz marked this pull request as ready for review May 2, 2026 17:38
Comment thread.asf.yaml Outdated
vy
vy approved these changes May 2, 2026
@vy
vy merged commit 59262d0 into mainMay 2, 2026
7 checks passed
@vy
vy deleted the feat/branch-protection branch May 2, 2026 17:49
ppkarwasz added a commit that referenced this pull request Aug 16, 2026
* Switch to GitHub Rulesets (second attempt)
The first attempt (#456) had to be reverted in #471 because a bug in ASFYaml made the resulting rulesets impossible to modify or remove through `.asf.yaml`. We rolled back to the legacy `protected_branches` configuration.
apache/infrastructure-asfyaml#93 has now landed and addresses the underlying issues (broken `app_slug` resolution, silent REST API failures, missing `refs/heads/` / `refs/tags/` prefixing), so we can move back to Rulesets.
The benefits over `protected_branches` remain:
- Tag references can also be protected (see the new `rel/*` ruleset).
- A single ruleset can target a glob of refs (e.g. `gha/*`) instead of one branch at a time.
- Rules are publicly visible at https://github.com/apache/logging-parent/rules, so we can verify that the effective rules are those configured and third parties can audit the project's protection policy too.
* fix: use raw syntax for tags
* fix: remove `protected_branches`
No longer needed since apache/infrastructure-asfyaml#121 was merged.
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@ppkarwasz@vy