Skip to content

fix: remove pull_request ruleset rule, restore push_allowances #187

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
omer-vishlitzky merged 1 commit into from
Aug 11, 2026
Merged

fix: remove pull_request ruleset rule, restore push_allowances #187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions modules/common_repository/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,17 +147,6 @@ resource "github_repository_ruleset" "status_checks" {
}

rules {
# When merge queue is enabled, require a PR for all changes. This
# blocks direct `git push` to main (unlike `update = true` which also
# breaks auto-merge evaluation). Native review count is 0 because
# approval is handled by Prow labels + check-labels gate.
dynamic "pull_request" {
for_each = var.merge_queue != null ? [1] : []
content {
required_approving_review_count = 0
}
}

required_status_checks {
# When merge queue is enabled, strict is unnecessary — the queue tests
# each PR against latest main before merging.
Expand Down
11 changes: 3 additions & 8 deletions repositories.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,11 +161,7 @@ module "repo_osac" {
# it's disabled at the GitHub level, not just by convention.
allow_squash_merge = false
ruleset_bypass_team_ids = [github_team.all["wg-infra"].id]
# push_allowances removed: classic branch protection's "Restrict who can push"
# overrides the merge queue bot's implicit push access and cannot include it
# (the bot is an internal GitHub app with no discoverable slug). The ruleset's
# merge_queue rule prevents unauthorized merges; force_push_bypassers (above)
# controls force pushes.
push_allowances = ["osac-project/wg-infra", "osac-project/org-admins"]

merge_queue = {
merge_method = "REBASE"
Expand Down Expand Up @@ -319,9 +315,8 @@ module "repo_osac_test_infra" {
{ context = "check-labels", integration_id = 15368 },
]
ruleset_bypass_team_ids = [github_team.all["wg-infra"].id]
# push_allowances removed: classic branch protection's "Restrict who can
# push" blocks the merge queue bot. Ruleset update rule handles this instead.
environments = [{ name = "e2e-test" }]
push_allowances = ["osac-project/wg-infra", "osac-project/org-admins"]
environments = [{ name = "e2e-test" }]

merge_queue = {
merge_method = "REBASE"
Expand Down
Loading