From 1cdd58c30517f09d140fa24abb89d98db190578b Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Fri, 14 Feb 2025 15:44:12 -0800 Subject: [PATCH 1/3] Update repo settings --- .github/repository-settings.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/repository-settings.md b/.github/repository-settings.md index 197dd6644470..349247212d41 100644 --- a/.github/repository-settings.md +++ b/.github/repository-settings.md @@ -32,7 +32,6 @@ settings](https://github.com/open-telemetry/community/blob/main/docs/how-to-conf - `release/*` - Branch rules - Restrict deletions: CHECKED - - Require linear history: CHECKED - Require a pull request before merging: CHECKED - Required approvals: 1 - Require review from Code Owners: CHECKED @@ -47,6 +46,10 @@ settings](https://github.com/open-telemetry/community/blob/main/docs/how-to-conf - Security alerts: High or higher - Alerts: Errors +> [!NOTE] +> This repository can't "require linear history" because there is an old merge commit on `main` +> (and so also on the release branches). + ### `cloudfoundry` branch - Targeted branches: From dd42eb0e3a511992008f3b1be588214de6d21517 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Fri, 14 Feb 2025 17:10:49 -0800 Subject: [PATCH 2/3] spotless --- .github/repository-settings.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/repository-settings.md b/.github/repository-settings.md index 349247212d41..99595ac9855e 100644 --- a/.github/repository-settings.md +++ b/.github/repository-settings.md @@ -46,7 +46,7 @@ settings](https://github.com/open-telemetry/community/blob/main/docs/how-to-conf - Security alerts: High or higher - Alerts: Errors -> [!NOTE] +> [!NOTE] > This repository can't "require linear history" because there is an old merge commit on `main` > (and so also on the release branches). From d95772a65471c441b19015c5c88b309c7df3eec9 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Sat, 15 Feb 2025 10:22:33 -0800 Subject: [PATCH 3/3] another --- .github/repository-settings.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/repository-settings.md b/.github/repository-settings.md index 99595ac9855e..8f8619842c24 100644 --- a/.github/repository-settings.md +++ b/.github/repository-settings.md @@ -37,9 +37,11 @@ settings](https://github.com/open-telemetry/community/blob/main/docs/how-to-conf - Require review from Code Owners: CHECKED - Allowed merge methods: Squash - Require status checks to pass - - EasyCLA - - `required-status-check` - - `gradle-wrapper-validation` + - Do not require status checks on creation: CHECKED + - Status checks that are required + - EasyCLA + - `required-status-check` + - `gradle-wrapper-validation` - Block force pushes: CHECKED - Require code scanning results: CHECKED - CodeQL