Skip to content

Try out merge queues #13211

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions .github/repository-settings.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,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
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ on:
branches:
- main
- release/*
merge_group:
workflow_dispatch:

permissions:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ on:
- v1.*
- cloudfoundry
- gh-pages
merge_group:
schedule:
- cron: "29 13 * * 2" # weekly at 13:29 UTC on Tuesday

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/publish-petclinic-benchmark-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ on:
- "benchmark-overhead/Dockerfile.petclinic"
branches:
- main
merge_group:
workflow_dispatch:

permissions:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:
- ".github/workflows/pr-smoke-test-early-jdk8-images.yml"
branches:
- main
merge_group:
workflow_dispatch:

permissions:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:
- ".github/workflows/publish-smoke-test-fake-backend-images.yml"
branches:
- main
merge_group:
workflow_dispatch:

permissions:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/publish-smoke-test-grpc-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ on:
- ".github/workflows/reusable-publish-smoke-test-images.yml"
branches:
- main
merge_group:
workflow_dispatch:

permissions:
contents: read
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/publish-smoke-test-play-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ on:
- ".github/workflows/reusable-publish-smoke-test-images.yml"
branches:
- main
merge_group:
workflow_dispatch:

permissions:
contents: read
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/publish-smoke-test-quarkus-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ on:
- ".github/workflows/reusable-publish-smoke-test-images.yml"
branches:
- main
merge_group:
workflow_dispatch:

permissions:
contents: read
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ on:
- ".github/workflows/reusable-publish-smoke-test-images.yml"
branches:
- main
merge_group:
workflow_dispatch:

permissions:
contents: read
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/publish-smoke-test-servlet-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:
- ".github/workflows/publish-smoke-test-servlet-images.yml"
branches:
- main
merge_group:
workflow_dispatch:

permissions:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/publish-smoke-test-spring-boot-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ on:
- ".github/workflows/reusable-publish-smoke-test-images.yml"
branches:
- main
merge_group:
workflow_dispatch:

permissions:
contents: read
Expand Down
Loading