Repository navigation
ci: let committers bypass the Merge Queue ruleset for urgent fixes - #3458
Merged
kevinjqliu merged 1 commit intoOct 16, 2026
Merged
Conversation
kevinjqliu
marked this pull request as draft
October 14, 2026 20:19
kevinjqliu
force-pushed
the
kevinjqliu-asf-yaml-merge-breakglass
branch
from
October 14, 2026 20:40
aa20104 to
0326804
Compare
Copilot stopped reviewing on behalf of
kevinjqliu due to an error
October 14, 2026 21:27
kevinjqliu
force-pushed
the
kevinjqliu-asf-yaml-merge-breakglass
branch
4 times, most recently
from
October 14, 2026 22:05
16f1987 to
057ebbf
Compare
comphead
approved these changes
Oct 15, 2026
comphead
left a comment
comphead
left a comment
Collaborator
There was a problem hiding this comment.
Thanks @kevinjqliu thats a good idea, the PR is still draft but the direction is def correct
kevinjqliu
force-pushed
the
kevinjqliu-asf-yaml-merge-breakglass
branch
from
October 15, 2026 16:44
057ebbf to
acc5b0c
Compare
Contributor
Author
|
will rebase this when #3459 is merged. I want to show the 2 changes separately |
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>
kevinjqliu
force-pushed
the
kevinjqliu-asf-yaml-merge-breakglass
branch
from
October 15, 2026 22:17
acc5b0c to
0963cfc
Compare
kevinjqliu
commented
Oct 15, 2026
Comment on lines
+48
to
+51
| # apache/root (ASF Infra). | ||
| - actor_id: 118420 | ||
| actor_type: Team | ||
| bypass_mode: always |
Contributor
Author
There was a problem hiding this comment.
adding apache/root here as backstop, just in case something goes wrong 🤷
kevinjqliu
marked this pull request as ready for review
October 15, 2026 22:18
blackmwk
reviewed
Oct 16, 2026
| bypass_mode: always | ||
| # apache/iceberg-public. Iceberg committers can opt into this team via | ||
| # https://gitbox.apache.org/boxer/. | ||
| - actor_id: 20107235 |
Contributor
There was a problem hiding this comment.
Should we also include apache/iceberg-private team? They are pmc members.
Contributor
Author
There was a problem hiding this comment.
we cant, iceberg-committers and iceberg private are both private teams and github doesnt allow private teams to be used in configs.
thats why ASF allows us to create a public team
blackmwk
approved these changes
Oct 16, 2026
blackmwk
left a comment
blackmwk
left a comment
Contributor
There was a problem hiding this comment.
Thanks @kevinjqliu for this pr, just one minor comment.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Which issue does this PR close?
What changes are included in this PR?
Adds a breakglass so committers can merge an urgent, approved PR (e.g. #3455 while CI is stuck) without waiting for the merge queue or required checks. This follows the apache/seatunnel setup.
iceberg-publicteamWe created
apache/iceberg-publicto use as the bypass actor.iceberg-committersis a private (secret) team, and secret teams can't be bypass actors. seatunnel did the same through INFRA-28376. Iceberg committers can opt in via Boxer. Membership syncs in about 15 minutes, and only current Iceberg committers can join.Merging an urgent PR
Also documented in
CONTRIBUTING.md. Use this only when necessary.iceberg-publicteam (one-time).gh pr merge <number> --squash --adminAre these changes tested?
Validated with apache/infrastructure-asfyaml on top of #3459. After merge,
gh api repos/apache/iceberg-rust/rulesets/22979505 --jq .current_user_can_bypassshould printpull_requests_onlyfor a team member.AI Disclosure
Drafted with GitHub Copilot.