From fc0de53849a005d62fa6fa5292687c7082230235 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Tue, 4 Feb 2025 18:22:17 -0800 Subject: [PATCH] Try out merge queues --- .github/repository-settings.md | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/.github/repository-settings.md b/.github/repository-settings.md index ee36cad9b9c1..a53f1d69f8e5 100644 --- a/.github/repository-settings.md +++ b/.github/repository-settings.md @@ -35,6 +35,14 @@ settings](https://github.com/open-telemetry/community/blob/main/docs/how-to-conf - Branch rules - Restrict deletions: CHECKED - Require linear history: CHECKED + - Require merge queue: CHECKED + - Merge method: Squash and merge + - Build concurrency: 5 + - Minimum group size: 1 + - Maximum group size: 5 + - Wait time to meet minimum group size (minutes): 5 + - Require all queue entries to pass required checks: CHECKED + - Status check timeout (minutes): 120 - Require a pull request before merging: CHECKED - Required approvals: 1 - Require review from Code Owners: CHECKED @@ -69,6 +77,20 @@ settings](https://github.com/open-telemetry/community/blob/main/docs/how-to-conf - Require linear history: CHECKED - Block force pushes: CHECKED +### Merge queue + +- Targeted branches: + - Default +- Branch rules + - Require merge queue: CHECKED + - Merge method: Squash and merge + - Build concurrency: 5 + - Minimum group size: 1 + - Maximum group size: 5 + - Wait time to meet minimum group size (minutes): 5 + - Require all queue entries to pass required checks: CHECKED + - Status check timeout (minutes): 120 + ### Restrict branch creation - Targeted branches