Yicong-Huang opened a new issue, #7093: URL: https://github.com/apache/texera/issues/7093
### Task Summary Harden the `.asf.yaml` branch-protection rulesets: - **Extend the merge queue to release branches.** Add `refs/heads/release/*` to the `Merge Queue` ruleset's include, so release branches get the same merge-queue + required PR review + required status checks + linear-history treatment as `main`. - **Drop `rel/*` protection.** Remove `refs/heads/rel/*` from `Default Branch Protection`; the `rel/*` scheme is deprecated (and is not in the creation allowlist below). - **Remove the `release/v1.1.0-incubating` exclude.** Restore its deletion / force-push protection now that the temporary maintenance tracked in #7085 is done. - **Restrict branch creation.** New `Restrict Branch Creation` ruleset blocks creating any branch except `main`, `release/*`, `backport/*`, `gh-pages`, and `gh-readonly-queue/*` (the merge queue's temporary test branches — excluded so the queue keeps working; Infra bypass retained). This affects only direct pushes to `apache/texera`; the fork-based contributor workflow is unaffected. **Notes for reviewer:** - `creation` is not available in asfyaml convenience syntax, and that syntax forbids mixing `bypass_teams` into a raw payload, so `Restrict Branch Creation` uses the raw form with `actor_id: 118420` for the Infra team. - With the merge queue now covering `release/*`, `Default Branch Protection` becomes redundant — its `deletion` / `non_fast_forward` rules are a subset of `Merge Queue`, which has no bypass. Consider removing it in a follow-up. - The `Merge Queue` ruleset's `min_entries_to_merge: 2` now also applies to `release/*`, but `min_entries_to_merge_wait_minutes: 3` caps the wait — a lone backport PR merges by itself after ~3 minutes if no second entry is queued, so backports are not blocked. - `Default Branch Protection` is intentionally retained (it overlaps `Merge Queue` on `main` + `release/*` but keeps the explicit Infra `bypass_teams: [root]`). ### Task Type - [x] DevOps / Deployment / 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]
