Skip to content

Commit edc2f40

Browse files
committed
Infra: Enable GitHub Merge Queue
1 parent ddd2c47 commit edc2f40

9 files changed

Lines changed: 29 additions & 3 deletions

File tree

.asf.yaml

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ github:
3636
protected_branches:
3737
main:
3838
required_status_checks:
39-
# strict means "Require branches to be up to date before merging".
40-
strict: true
4139
contexts:
4240
# Repository policy and security checks.
4341
- Analyze Actions
@@ -58,6 +56,25 @@ github:
5856
required_approving_review_count: 1
5957

6058
required_linear_history: true
59+
rulesets:
60+
- name: Merge Queue
61+
target: branch
62+
enforcement: active
63+
conditions:
64+
ref_name:
65+
include:
66+
- "~DEFAULT_BRANCH"
67+
exclude: []
68+
rules:
69+
- type: merge_queue
70+
parameters:
71+
check_response_timeout_minutes: 90
72+
grouping_strategy: ALLGREEN
73+
max_entries_to_build: 1
74+
max_entries_to_merge: 1
75+
merge_method: SQUASH
76+
min_entries_to_merge: 1
77+
min_entries_to_merge_wait_minutes: 0
6178
pull_requests:
6279
# allow pull requests to merge automatically once all requirements are met
6380
allow_auto_merge: true

.github/workflows/asf-allowlist-check.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ name: "ASF Allowlist Check"
2525

2626
on:
2727
pull_request:
28+
merge_group:
2829
push:
2930
branches:
3031
- main

.github/workflows/check-md-link.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ on:
2727
branches:
2828
- 'main'
2929
pull_request:
30+
merge_group:
3031
workflow_dispatch:
3132

3233
permissions:

.github/workflows/codeql.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ on:
2424
branches: [ "main" ]
2525
pull_request:
2626
branches: [ "main" ]
27+
merge_group:
2728
schedule:
2829
- cron: '16 4 * * 1'
2930

.github/workflows/license_check.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@
1818
#
1919

2020
name: "Run License Check"
21-
on: pull_request
21+
on:
22+
pull_request:
23+
merge_group:
2224

2325
permissions:
2426
contents: read

.github/workflows/python-ci-docs.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ on:
2424
branches:
2525
- 'main'
2626
pull_request:
27+
merge_group:
2728

2829
permissions:
2930
contents: read

.github/workflows/python-ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ on:
2424
branches:
2525
- 'main'
2626
pull_request:
27+
merge_group:
2728

2829
permissions:
2930
contents: read

.github/workflows/python-integration.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ on:
2424
branches:
2525
- 'main'
2626
pull_request:
27+
merge_group:
2728

2829
permissions:
2930
contents: read

.github/workflows/zizmor.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ on:
2424
branches: ["main"]
2525
pull_request:
2626
branches: ["**"]
27+
merge_group:
2728

2829
permissions: {}
2930

0 commit comments

Comments
 (0)