DanielLeens opened a new pull request, #12221:
URL: https://github.com/apache/seatunnel/pull/12221
## Purpose
Follow up on #12219. The previous change did take effect for the `Merge
Queue` ruleset: as `davidzollo`, GitHub reports `current_user_can_bypass:
pull_requests_only` for ruleset `21528411`. However, the merge UI still remains
blocked because `github.protected_branches.dev` continues to enforce the
`Build` check and one approval outside the ruleset bypass path.
ASF `.asf.yaml` documentation states that classic branch protection and
rulesets can both be active at the same time, and GitHub applies the most
restrictive result. So the bypass actor must cover the full merge gate, not
only the merge queue rule.
## Change
- Move the existing `dev` branch `Build` required check into the raw `Merge
Queue` ruleset as a `required_status_checks` rule.
- Move the existing one-review requirement into the same ruleset as a
`pull_request` rule.
- Preserve deletion and non-fast-forward protections in the ruleset.
- Keep `davidzollo` (`actor_id: 15833811`) as `actor_type: User` with
`bypass_mode: pull_request`.
- Set `protected_branches: ~` so classic branch protection stops applying a
stricter, non-bypassable gate alongside the ruleset.
## Validation
- Confirmed #12219 is merged into `origin/dev`.
- Confirmed live ruleset `21528411` reports `current_user_can_bypass:
pull_requests_only` for `davidzollo`.
- Confirmed `davidzollo` resolves to GitHub user id `15833811` and has
`write` permission on `apache/seatunnel`.
- Confirmed the only currently protected branch reported by the branches API
is `dev`.
- Confirmed GitHub accepts the added `pull_request` and
`required_status_checks` raw ruleset payload on a temporary disabled ruleset in
`DanielLeens/seatunnel`; temporary validation rulesets were deleted afterward.
- Confirmed ASF `infrastructure-asfyaml` passes raw rulesets through with
only light normalization and treats `protected_branches: ~` as removal of
existing classic branch protections.
- `ruby -e 'require "yaml"; YAML.load_file(".asf.yaml"); puts "YAML OK"'`
- `git diff --check`
- `./mvnw spotless:apply -nsu -Dmaven.gitcommitid.skip=true`
- Independent maintainer-style review of the final diff: no blockers.
No local compile/test/E2E was run because this is a `.asf.yaml` config-only
change and the local SeaTunnel protocol keeps real build/test validation on
GitHub CI.
--
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]
