Skip to content

Commit c0c66d6

Browse files
committed
ci(mergify): upgrade configuration to current format
1 parent 0f24c17 commit c0c66d6

File tree

1 file changed

+35
-13
lines changed

1 file changed

+35
-13
lines changed

.mergify.yml

Lines changed: 35 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,31 @@
11
queue_rules:
2-
- name: default
3-
conditions:
4-
# Conditions to get out of the queue (= merged)
2+
- name: duplicated default from Automatically approve and merge Dependabot PRs
3+
queue_conditions:
4+
- base~=master|integ-tests
5+
- "#approved-reviews-by>=1"
6+
- approved-reviews-by=@aws-actions/aws-ecs-devx
7+
- -approved-reviews-by~=author
58
- status-success=Run Unit Tests
69
- status-success=Semantic Pull Request
710
- status-success=Analyze (javascript)
8-
9-
pull_request_rules:
10-
- name: Automatically merge on CI success and review approval
11-
conditions:
11+
- label!=work-in-progress
12+
- -title~=(WIP|wip)
13+
- -merged
14+
- -closed
15+
- author!=dependabot[bot]
16+
- base=master
17+
- author=dependabot[bot]
18+
- status-success=Run Unit Tests
19+
- status-success=Semantic Pull Request
20+
- status-success=Analyze (javascript)
21+
- -title~=(WIP|wip)
22+
- -label~=(blocked|do-not-merge)
23+
- -merged
24+
- -closed
25+
merge_conditions: []
26+
merge_method: squash
27+
- name: default
28+
queue_conditions:
1229
- base~=master|integ-tests
1330
- "#approved-reviews-by>=1"
1431
- approved-reviews-by=@aws-actions/aws-ecs-devx
@@ -21,11 +38,14 @@ pull_request_rules:
2138
- -merged
2239
- -closed
2340
- author!=dependabot[bot]
24-
actions:
25-
queue:
26-
method: squash
27-
name: default
41+
merge_conditions:
42+
# Conditions to get out of the queue (= merged)
43+
- status-success=Run Unit Tests
44+
- status-success=Semantic Pull Request
45+
- status-success=Analyze (javascript)
46+
merge_method: squash
2847

48+
pull_request_rules:
2949
- name: Automatically approve and merge Dependabot PRs
3050
conditions:
3151
- base=master
@@ -40,6 +60,8 @@ pull_request_rules:
4060
actions:
4161
review:
4262
type: APPROVE
63+
- name: Automatically approve and merge Dependabot PRs + Automatically merge on
64+
CI success and review approval
65+
conditions: []
66+
actions:
4367
queue:
44-
method: squash
45-
name: default

0 commit comments

Comments
 (0)