Skip to content

Commit b43f991

Browse files
jasonmcintoshmergify[bot]
authored andcommitted
fix(mergify): Mergify config needs adjusting for latest mergify releases (#6321)
* fix(mergify): Mergify config needs adjusting for latest mergify releases * fix(mergify): Add integration test checks * fix(mergify): Add integration test checks * fix(mergify): Add integration test checks * fix(mergify): Use just queue_conditions Reduces duplication since the queue_conditions would happen before merge_conditions. (cherry picked from commit 3f43ac2)
1 parent fb1850b commit b43f991

File tree

1 file changed

+22
-11
lines changed

1 file changed

+22
-11
lines changed

.mergify.yml

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,72 @@
11
queue_rules:
22
- name: default
3-
conditions:
4-
- status-success=build
3+
merge_method: squash
4+
queue_conditions:
5+
- check-success=build
6+
- check-success=it-test
57

68
pull_request_rules:
9+
- name: Make sure PR are up to date before merging
10+
description: This automatically updates PRs when they are out-of-date with the
11+
base branch to avoid semantic conflicts (next step is using a merge queue).
12+
conditions: []
13+
actions:
14+
update:
15+
- name: Automatically merge backports to releases on succesful build
16+
conditions:
17+
- base~=^(release-)
18+
- head~=^mergify\/bp\/
19+
- "author=mergify[bot]"
20+
actions:
21+
queue:
22+
name: default
23+
label:
24+
add: ["auto merged"]
725
- name: Automatically merge on CI success and review
826
conditions:
927
- base=master
10-
- status-success=build
1128
- "label=ready to merge"
1229
- "approved-reviews-by=@oss-approvers"
30+
- "#approved-reviews-by>=1"
1331
actions:
1432
queue:
15-
method: squash
1633
name: default
1734
label:
1835
add: ["auto merged"]
1936
- name: Automatically merge release branch changes on CI success and release manager review
2037
conditions:
2138
- base~=^release-
22-
- status-success=build
2339
- "label=ready to merge"
2440
- "approved-reviews-by=@release-managers"
2541
actions:
2642
queue:
27-
method: squash
2843
name: default
2944
label:
3045
add: ["auto merged"]
3146
- name: Automatically merge PRs from maintainers on CI success and review
3247
conditions:
3348
- base=master
34-
- status-success=build
3549
- "label=ready to merge"
3650
- "author=@oss-approvers"
51+
- "#approved-reviews-by>=1"
3752
actions:
3853
queue:
39-
method: squash
4054
name: default
4155
label:
4256
add: ["auto merged"]
4357
- name: Automatically merge autobump PRs on CI success
4458
conditions:
4559
- base~=^(master|release-)
46-
- status-success=build
4760
- "label~=autobump-*"
4861
- "author:spinnakerbot"
4962
actions:
5063
queue:
51-
method: squash
5264
name: default
5365
label:
5466
add: ["auto merged"]
5567
- name: Request reviews for autobump PRs on CI failure
5668
conditions:
5769
- base~=^(master|release-)
58-
- status-failure=build
5970
- "label~=autobump-*"
6071
- base=master
6172
actions:

0 commit comments

Comments
 (0)