andygrove opened a new pull request, #2394:
URL: https://github.com/apache/datafusion-ballista/pull/2394
# Which issue does this PR close?
N/A
# Rationale for this change
`main` in this repo can currently be merged into without any approving
review, which is different from `apache/datafusion` and
`apache/datafusion-comet`, where both require one approval.
The reason is that Ballista never had review requirements configured. The
only protection on `main` today comes from the ruleset that ASF Infra added in
c4336a83d ("Set up default protection ruleset for default and release
branches"), which is a fleet-wide default that only sets `restrict_deletion`
and `restrict_force_push`. Checking the live repository settings confirms this:
- `GET /repos/apache/datafusion-ballista/rulesets/16498601` lists exactly
two rules, `deletion` and `non_fast_forward`
- `GET /repos/apache/datafusion-ballista/branches/main/protection` returns
404, so there is no classic branch protection at all
DataFusion and Comet get their approval requirement from a
`protected_branches` block in `.asf.yaml`, which Ballista does not have.
# What changes are included in this PR?
Adds a `protected_branches` block to `.asf.yaml` setting
`required_approving_review_count: 1` on `main`, `branch-53` and `branch-54`.
This is the same mechanism `apache/datafusion-comet` uses.
A few notes for reviewers:
- The existing Infra-managed ruleset is left in place. Legacy
`protected_branches` and the newer `rulesets` are separate mechanisms and apply
cumulatively, so deletion and force-push stay restricted. `apache/airflow` runs
both side by side today.
- `.asf.yaml` does not support wildcards in `protected_branches`, so release
branches have to be listed by name. I only listed the two active ones rather
than every historical `branch-*`. Happy to add more if people would prefer to
match Comet's approach of listing all of them.
- No `required_status_checks` are added here, so this only requires an
approval, not a green CI run. Comet does the same. That can be a follow-up if
there is appetite for it.
- This does mean committers can no longer merge their own PRs unreviewed,
including small dependency bumps, so it is worth a quick sanity check that
people are happy with that tradeoff. `allow_auto_merge` is already enabled,
which takes some of the sting out of it.
# Are there any user-facing changes?
No.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
