kevinjqliu opened a new pull request, #3489: URL: https://github.com/apache/iceberg-rust/pull/3489
## Which issue does this PR close? <!-- We generally require a GitHub issue to be filed for all bug fixes and enhancements and this helps us generate change logs for our releases. You can link an issue to this PR using the GitHub syntax. For example `Closes #123` indicates that this PR will close issue #123. --> - N/A. Follow-up to #3481. ## What changes are included in this PR? <!-- Provide a summary of the modifications in this PR. List the main changes such as new features, bug fixes, refactoring, or any other updates. --> After #3481, the breakglass still doesn't work: on an approved PR, `viewerMergeActions` reports `DIRECT_MERGE: BLOCKED` for `iceberg-public` members. The cause is `bypass_mode: pull_request` on the Merge Queue ruleset. That mode doesn't allow merging a PR outside the queue. Switching it to `always` does. `always` doesn't loosen the approval rule: Default Branch Protection is a separate ruleset that only `apache/root` can bypass, so a bypass merge still requires an approved PR, and direct pushes or force pushes to `main` stay blocked. ## Are these changes tested? <!-- Specify what test covers (unit test, integration test, etc.). If tests are not included in your PR, please explain why (for example, are they covered by existing tests)? --> Reproduced both rulesets in a scratch org repo, with a team bypass actor: | Bypass mode | Ruleset layout | `DIRECT_MERGE` | |---|---|---| | `pull_request` | two rulesets (current `main`) | `BLOCKED` | | `pull_request` | one combined ruleset | `BLOCKED` | | `always` | two rulesets (this PR) | `ALLOWED_WITH_BYPASS` | With `always`: - Direct merge of an unapproved PR is rejected: "At least 1 approving review is required". - Direct merge with the approval requirement met succeeds without entering the queue. - The UI shows "Merge without waiting for requirements to be met (bypass rules)" when a required check fails. On an all-green PR it only shows "Merge when ready"; `gh pr merge --squash --admin` still merges directly. After merge, `viewerMergeActions` on an approved PR should show `DIRECT_MERGE: ALLOWED_WITH_BYPASS` for an `iceberg-public` member. ## AI Disclosure <!-- https://iceberg.apache.org/contribute/#guidelines-for-ai-assisted-contributions --> Drafted with GitHub Copilot. The scratch test couldn't use a second account, so approval was simulated by setting `required_approving_review_count` to 0 for the merge case and 1 for the rejection case. I didn't test a direct `git push` to the default branch under `always`. -- 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]
