Skip to content

Commit 9837210

Browse files
committed
ci(mergify): upgrade configuration to current format
1 parent d8b42bd commit 9837210

1 file changed

Lines changed: 30 additions & 16 deletions

File tree

.mergify.yml

Lines changed: 30 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,6 @@
11
queue_rules:
2-
- name: default
3-
conditions:
4-
# Conditions to get out of the queue (= merged)
5-
- status-success=Run Unit Tests
6-
- status-success=Semantic Pull Request
7-
- status-success=Analyze (javascript)
8-
9-
pull_request_rules:
10-
- name: Automatically merge on CI success and review approval
11-
conditions:
2+
- name: duplicated default from Automatically merge on CI success and review approval
3+
queue_conditions:
124
- base~=master|integ-tests
135
- "#approved-reviews-by>=1"
146
- approved-reviews-by=@aws-actions/aws-ecs-devx
@@ -21,11 +13,31 @@ pull_request_rules:
2113
- -merged
2214
- -closed
2315
- author!=dependabot[bot]
24-
actions:
25-
queue:
26-
method: squash
27-
name: default
16+
merge_conditions:
17+
# Conditions to get out of the queue (= merged)
18+
- status-success=Run Unit Tests
19+
- status-success=Semantic Pull Request
20+
- status-success=Analyze (javascript)
21+
merge_method: squash
22+
- name: duplicated default from Automatically approve and merge Dependabot PRs
23+
queue_conditions:
24+
- base=master
25+
- author=dependabot[bot]
26+
- status-success=Run Unit Tests
27+
- status-success=Semantic Pull Request
28+
- status-success=Analyze (javascript)
29+
- -title~=(WIP|wip)
30+
- -label~=(blocked|do-not-merge)
31+
- -merged
32+
- -closed
33+
merge_conditions:
34+
# Conditions to get out of the queue (= merged)
35+
- status-success=Run Unit Tests
36+
- status-success=Semantic Pull Request
37+
- status-success=Analyze (javascript)
38+
merge_method: squash
2839

40+
pull_request_rules:
2941
- name: Automatically approve and merge Dependabot PRs
3042
conditions:
3143
- base=master
@@ -40,6 +52,8 @@ pull_request_rules:
4052
actions:
4153
review:
4254
type: APPROVE
55+
- name: Automatically approve and merge Dependabot PRs + Automatically merge on
56+
CI success and review approval
57+
conditions: []
58+
actions:
4359
queue:
44-
method: squash
45-
name: default

0 commit comments

Comments
 (0)