Skip to content

Commit 932b289

Browse files
committed
updates
1 parent 17b25b3 commit 932b289

File tree

1 file changed

+22
-2
lines changed

1 file changed

+22
-2
lines changed

.github/repository-settings.md

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,25 @@
33
Same
44
as [opentelemetry-java-instrumentation repository settings](https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/main/.github/repository-settings.md#repository-settings),
55
except for
6-
* The rules for `gh-pages` and `cloudfoundry` branches are not relevant in this repository.
7-
* "Restrict branch creation" includes an exclusion for `gh-readonly-queue/main/pr-*`.
6+
7+
- The rules for `gh-pages` and `cloudfoundry` branches are not relevant in this repository.
8+
9+
## Merge queue
10+
11+
Needs to be enabled using classic branch protection (instead of rule set)
12+
because of our use of the classic branch protection "Restrict who can push to matching branches"
13+
which otherwise will block the merge queue from merging to main.
14+
15+
### Restrict branch creation
16+
17+
- Additional exclusion for `gh-readonly-queue/main/pr-*`
18+
19+
### Classic branch protection for `main`
20+
21+
- Require merge queue: CHECKED
22+
- Build concurrency: 5
23+
- Maximum pull requests to build: 5
24+
- Minimum pull requests to merge: 1, or after 5 minutes
25+
- Maximum pull requests to merge: 5
26+
- Only merge non-failing pull requests: CHECKED
27+
- Status check timeout: 60 minutes

0 commit comments

Comments
 (0)