Skip to content

Commit 41ce6e0

Browse files
committed
ci(mergify): upgrade configuration to current format
1 parent f549793 commit 41ce6e0

File tree

1 file changed

+30
-16
lines changed

1 file changed

+30
-16
lines changed

.mergify.yml

+30-16
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
1+
12
pull_request_rules:
2-
- name: automatic squash-merge for master when CI passes and approved
3-
conditions:
3+
- name: automatic merge for stable when CI passes and approved + automatic squash-merge
4+
for master when CI passes and approved
5+
conditions: []
6+
actions:
7+
queue:
8+
queue_rules:
9+
- name: duplicated default from automatic squash-merge for master when CI passes
10+
and approved
11+
queue_conditions:
412
- "#approved-reviews-by>=1"
513
- and:
614
# Unfortunately, we cannot just say "all CI must pass".
@@ -9,13 +17,17 @@ pull_request_rules:
917
- check-success=docker
1018
- check-success=SonarCloud Code Analysis
1119
- base=master
12-
actions:
13-
queue:
14-
name: default
15-
method: squash
16-
update_method: rebase
17-
- name: automatic merge for stable when CI passes and approved
18-
conditions:
20+
merge_conditions:
21+
- and:
22+
# Unfortunately, we cannot just say "all CI must pass".
23+
# This is not a bot limitation, but a limitation in Github itself.
24+
- check-success=all-tests
25+
- check-success=docker
26+
- check-success=SonarCloud Code Analysis
27+
update_method: rebase
28+
merge_method: squash
29+
- name: duplicated default from automatic merge for stable when CI passes and approved
30+
queue_conditions:
1931
- "#approved-reviews-by>=1"
2032
- and:
2133
# Unfortunately, we cannot just say "all CI must pass".
@@ -24,13 +36,15 @@ pull_request_rules:
2436
- check-success=docker
2537
- check-success=SonarCloud Code Analysis
2638
- base=stable
27-
actions:
28-
queue:
29-
name: default
30-
method: rebase
31-
update_method: rebase
32-
33-
queue_rules:
39+
merge_conditions:
40+
- and:
41+
# Unfortunately, we cannot just say "all CI must pass".
42+
# This is not a bot limitation, but a limitation in Github itself.
43+
- check-success=all-tests
44+
- check-success=docker
45+
- check-success=SonarCloud Code Analysis
46+
update_method: rebase
47+
merge_method: rebase
3448
- name: default
3549
conditions:
3650
- and:

0 commit comments

Comments
 (0)