Skip to content

Commit 7fbfeb2

Browse files
authored
Update repo settings (#1846)
1 parent d4f9c1e commit 7fbfeb2

File tree

1 file changed

+25
-2
lines changed

1 file changed

+25
-2
lines changed

.github/repository-settings.md

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,28 @@
22

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),
5-
except that the rules for `gh-pages` and `cloudfoundry` branches are not relevant in this
6-
repository.
5+
except for
6+
7+
- The rules for `gh-pages` and `cloudfoundry` branches are not relevant in this repository.
8+
9+
and the enablement of merge queues below.
10+
11+
## Merge queue
12+
13+
Needs to be enabled using classic branch protection (instead of rule set)
14+
because of our use of the classic branch protection "Restrict who can push to matching branches"
15+
which otherwise will block the merge queue from merging to main.
16+
17+
### Restrict branch creation
18+
19+
- Additional exclusion for `gh-readonly-queue/main/pr-*`
20+
21+
### Classic branch protection for `main`
22+
23+
- Require merge queue: CHECKED
24+
- Build concurrency: 5
25+
- Maximum pull requests to build: 5
26+
- Minimum pull requests to merge: 1, or after 5 minutes
27+
- Maximum pull requests to merge: 5
28+
- Only merge non-failing pull requests: CHECKED
29+
- Status check timeout: 60 minutes

0 commit comments

Comments
 (0)