Skip to content

Commit 00a6e65

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

File tree

1 file changed

+46
-25
lines changed

1 file changed

+46
-25
lines changed

.mergify.yml

+46-25
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,63 @@
11
queue_rules:
2-
- name: default
3-
conditions:
2+
- name: duplicated default from Merge for developers
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
8+
- status-success=build (compile-linux)
9+
- status-success=build (compile-windows)
10+
- status-success=build (compile-darwin)
11+
- status-success=test
12+
- status-success=staticcheck
13+
- status-success=license
14+
- -label~=(WIP|do-not-merge)
15+
- -title~=(WIP|wip)
16+
- -merged
17+
- -closed
18+
- author!=dependabot[bot]
19+
merge_conditions:
420
- status-success=build (compile-linux)
521
- status-success=build (compile-windows)
622
- status-success=build (compile-darwin)
723
- status-success=test
824
- status-success=staticcheck
925
- status-success=license
26+
commit_message_template: |
27+
{{ title }} (#{{ number }})
1028
11-
pull_request_rules:
12-
- name: Merge for developers
13-
conditions:
14-
- base~=(mainline|rename-commands)
15-
- "#approved-reviews-by>=2"
16-
- approved-reviews-by=@aws/aws-ecs-devx
17-
- -approved-reviews-by~=author
29+
{{ body }}
30+
merge_method: squash
31+
- name: duplicated default from Merge for bots
32+
queue_conditions:
33+
- base=mainline
34+
- "#approved-reviews-by>=1"
35+
- "#changes-requested-reviews-by=0"
1836
- status-success=build (compile-linux)
1937
- status-success=build (compile-windows)
2038
- status-success=build (compile-darwin)
2139
- status-success=test
2240
- status-success=staticcheck
2341
- status-success=license
24-
- -label~=(WIP|do-not-merge)
42+
- author=dependabot[bot]
2543
- -title~=(WIP|wip)
44+
- -label~=(WIP|do-not-merge)
2645
- -merged
2746
- -closed
28-
- author!=dependabot[bot]
29-
actions:
30-
queue:
31-
name: default
32-
method: squash
33-
commit_message_template: |
34-
{{ title }} (#{{ number }})
47+
merge_conditions:
48+
- status-success=build (compile-linux)
49+
- status-success=build (compile-windows)
50+
- status-success=build (compile-darwin)
51+
- status-success=test
52+
- status-success=staticcheck
53+
- status-success=license
54+
commit_message_template: |
55+
{{ title }} (#{{ number }})
56+
57+
{{ body }}
58+
merge_method: squash
3559

36-
{{ body }}
60+
pull_request_rules:
3761
- name: Merge for bots
3862
conditions:
3963
- base=mainline
@@ -53,13 +77,6 @@ pull_request_rules:
5377
actions:
5478
review:
5579
type: APPROVE
56-
queue:
57-
name: default
58-
method: squash
59-
commit_message_template: |
60-
{{ title }} (#{{ number }})
61-
62-
{{ body }}
6380
- name: Ask Japanese docs reviews
6481
conditions:
6582
- files~=\.ja.md$
@@ -68,3 +85,7 @@ pull_request_rules:
6885
request_reviews:
6986
users:
7087
- hkford
88+
- name: Merge for bots + Merge for developers
89+
conditions: []
90+
actions:
91+
queue:

0 commit comments

Comments
 (0)