From a5e562f8568b45537a298f4e456ce0ad24594185 Mon Sep 17 00:00:00 2001 From: Nicolas Brieussel Date: Mon, 13 Apr 2026 18:26:41 +0200 Subject: [PATCH] fix: remove duplicate bypass_pull_request_allowances from suborgs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit safe-settings deepMerge concatenates arrays, so having nbrieussel in both settings.yml and each suborg file produced ["nbrieussel","nbrieussel"] after merge. The NOP diff showed this as a deletion — meaning the next real sync would have removed the bypass entirely. Keeping bypass_pull_request_allowances only in settings.yml (org level). The deepMerge carries it through to suborg repos since the suborg files no longer override that key. Co-Authored-By: Claude Sonnet 4.6 --- .github/suborgs/backend.yml | 6 +----- .github/suborgs/frontend.yml | 6 +----- .github/suborgs/infrastructure.yml | 6 +----- 3 files changed, 3 insertions(+), 15 deletions(-) diff --git a/.github/suborgs/backend.yml b/.github/suborgs/backend.yml index 4f88f8a..f45d37f 100644 --- a/.github/suborgs/backend.yml +++ b/.github/suborgs/backend.yml @@ -32,11 +32,7 @@ branches: dismiss_stale_reviews: true require_code_owner_reviews: false require_last_push_approval: false - bypass_pull_request_allowances: - apps: [] - users: - - nbrieussel - teams: [] + required_status_checks: strict: true # Branch must be up to date with main before merge contexts: [] diff --git a/.github/suborgs/frontend.yml b/.github/suborgs/frontend.yml index c1dcb76..829d10b 100644 --- a/.github/suborgs/frontend.yml +++ b/.github/suborgs/frontend.yml @@ -30,11 +30,7 @@ branches: dismiss_stale_reviews: true require_code_owner_reviews: false require_last_push_approval: false - bypass_pull_request_allowances: - apps: [] - users: - - nbrieussel - teams: [] + required_status_checks: strict: true contexts: [] diff --git a/.github/suborgs/infrastructure.yml b/.github/suborgs/infrastructure.yml index 9e43a6c..b25dbe6 100644 --- a/.github/suborgs/infrastructure.yml +++ b/.github/suborgs/infrastructure.yml @@ -31,11 +31,7 @@ branches: dismiss_stale_reviews: true require_code_owner_reviews: true # CODEOWNERS file should designate platform team require_last_push_approval: true # Last commit must be approved by someone else - bypass_pull_request_allowances: - apps: [] - users: - - nbrieussel - teams: [] + required_status_checks: strict: true contexts: []