Skip to content

fix: re-enable pull_request rule, remove push_allowances #188

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 12, 2026
Merged

fix: re-enable pull_request rule, remove push_allowances #188

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
9 changes: 9 additions & 0 deletions modules/common_repository/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,15 @@ resource "github_repository_ruleset" "status_checks" {
}

rules {
# Block direct pushes — require a PR. CHANGES_REQUESTED reviews are
# auto-dismissed by the auto-queue workflow so they don't block merging.
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
2 changes: 0 additions & 2 deletions repositories.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,6 @@ 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 = ["osac-project/wg-infra", "osac-project/org-admins"]

merge_queue = {
merge_method = "REBASE"
Expand Down Expand Up @@ -315,7 +314,6 @@ module "repo_osac_test_infra" {
{ context = "check-labels", integration_id = 15368 },
]
ruleset_bypass_team_ids = [github_team.all["wg-infra"].id]
push_allowances = ["osac-project/wg-infra", "osac-project/org-admins"]
environments = [{ name = "e2e-test" }]

merge_queue = {
Expand Down
Loading