Skip to content

Commit 0619254

Browse files
kevinjqliuCopilot
andauthored
ci: let committers bypass the Merge Queue ruleset for urgent fixes (#3458)
Give apache/iceberg-public a pull_request-only bypass on the Merge Queue ruleset so an approved urgent fix can skip the queue and required checks. Direct pushes stay blocked, and the approval in classic protection still applies. The team holds committers who opted in via Boxer; the regular committers team is secret and cannot be a bypass actor. apache/root can always bypass. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
1 parent f83bec4 commit 0619254

2 files changed

Lines changed: 20 additions & 0 deletions

File tree

‎.asf.yaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,16 @@ github:
4444
- name: Merge Queue
4545
target: branch
4646
enforcement: active
47+
bypass_actors:
48+
# apache/root (ASF Infra).
49+
- actor_id: 118420
50+
actor_type: Team
51+
bypass_mode: always
52+
# apache/iceberg-public. Iceberg committers can opt into this team via
53+
# https://gitbox.apache.org/boxer/.
54+
- actor_id: 20107235
55+
actor_type: Team
56+
bypass_mode: pull_request
4757
conditions:
4858
ref_name:
4959
include:

‎CONTRIBUTING.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,16 @@ All pull requests are squash merged. We generally discourage large pull requests
6666

6767
When a pull request is under review, please avoid using force push as it makes it difficult for reviewer to track changes. If you need to keep the branch up to date with the main branch, consider using `git merge` instead.
6868

69+
#### Merging an urgent PR
70+
71+
Committers can merge an urgent, approved pull request (for example, a security fix while CI is stuck) without waiting for the merge queue or required checks. Use this only when necessary; otherwise, let the merge queue and required checks run.
72+
73+
1. Join the [`apache/iceberg-public`](https://github.com/orgs/apache/teams/iceberg-public) team via [Boxer](https://gitbox.apache.org/boxer/) (one-time; membership syncs in about 15 minutes).
74+
2. Get the pull request approved by a committer.
75+
3. Merge without waiting for the queue or required checks:
76+
- CLI: `gh pr merge <number> --squash --admin`
77+
- Web UI: check "Merge without waiting for requirements to be met" ([docs](https://docs.github.com/en/pull-requests/how-tos/merge-and-close-pull-requests/merging-a-pull-request-with-a-merge-queue#adding-a-pull-request-to-a-merge-queue))
78+
6979
### CI
7080

7181
Currently, iceberg-rust uses GitHub Actions to run tests. The workflows are defined in `.github/workflows`.

0 commit comments

Comments
 (0)