Skip to content

Commit 225117c

Browse files
committed
ci(mergify): upgrade configuration to current format
1 parent 949daed commit 225117c

File tree

1 file changed

+49
-19
lines changed

1 file changed

+49
-19
lines changed

.mergify.yml

+49-19
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,43 @@
11
queue_rules:
2-
- name: default
3-
conditions:
2+
- name: duplicated default from Merge for bots
3+
queue_conditions:
4+
- base~=(mainline|rename-commands)
5+
- "#approved-reviews-by>=2"
6+
- approved-reviews-by=@aws/aws-ecs-devx
7+
- -approved-reviews-by~=author
48
- status-success=build (compile-linux)
59
- status-success=build (compile-windows)
610
- status-success=build (compile-darwin)
711
- status-success=test
812
- status-success=staticcheck
913
- status-success=license
14+
- -label~=(WIP|do-not-merge)
15+
- -title~=(WIP|wip)
16+
- -merged
17+
- -closed
18+
- author!=dependabot[bot]
19+
- base=mainline
20+
- "#approved-reviews-by>=1"
21+
- "#changes-requested-reviews-by=0"
22+
- status-success=build (compile-linux)
23+
- status-success=build (compile-windows)
24+
- status-success=build (compile-darwin)
25+
- status-success=test
26+
- status-success=staticcheck
27+
- status-success=license
28+
- author=dependabot[bot]
29+
- -title~=(WIP|wip)
30+
- -label~=(WIP|do-not-merge)
31+
- -merged
32+
- -closed
33+
merge_conditions: []
34+
commit_message_template: |
35+
{{ title }} (#{{ number }})
1036
11-
pull_request_rules:
12-
- name: Merge for developers
13-
conditions:
37+
{{ body }}
38+
merge_method: squash
39+
- name: default
40+
queue_conditions:
1441
- base~=(mainline|rename-commands)
1542
- "#approved-reviews-by>=2"
1643
- approved-reviews-by=@aws/aws-ecs-devx
@@ -26,14 +53,20 @@ pull_request_rules:
2653
- -merged
2754
- -closed
2855
- author!=dependabot[bot]
29-
actions:
30-
queue:
31-
name: default
32-
method: squash
33-
commit_message_template: |
34-
{{ title }} (#{{ number }})
56+
merge_conditions:
57+
- status-success=build (compile-linux)
58+
- status-success=build (compile-windows)
59+
- status-success=build (compile-darwin)
60+
- status-success=test
61+
- status-success=staticcheck
62+
- status-success=license
63+
commit_message_template: |
64+
{{ title }} (#{{ number }})
65+
66+
{{ body }}
67+
merge_method: squash
3568

36-
{{ body }}
69+
pull_request_rules:
3770
- name: Merge for bots
3871
conditions:
3972
- base=mainline
@@ -53,13 +86,6 @@ pull_request_rules:
5386
actions:
5487
review:
5588
type: APPROVE
56-
queue:
57-
name: default
58-
method: squash
59-
commit_message_template: |
60-
{{ title }} (#{{ number }})
61-
62-
{{ body }}
6389
- name: Ask Japanese docs reviews
6490
conditions:
6591
- files~=\.ja.md$
@@ -68,3 +94,7 @@ pull_request_rules:
6894
request_reviews:
6995
users:
7096
- hkford
97+
- name: Merge for bots + Merge for developers
98+
conditions: []
99+
actions:
100+
queue:

0 commit comments

Comments
 (0)