Skip to content

Commit f9da080

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

File tree

1 file changed

+33
-13
lines changed

1 file changed

+33
-13
lines changed

.mergify.yml

Lines changed: 33 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,30 @@
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
7-
8-
pull_request_rules:
9-
- name: Automatically merge on CI success and review approval
10-
conditions:
10+
- label!=work-in-progress
11+
- -title~=(WIP|wip)
12+
- -merged
13+
- -closed
14+
- author!=dependabot[bot]
15+
- base=master
16+
- author=dependabot[bot]
17+
- status-success=Run Unit Tests
18+
- status-success=Semantic Pull Request
19+
- -title~=(WIP|wip)
20+
- -label~=(blocked|do-not-merge)
21+
- -merged
22+
- -closed
23+
merge_conditions: []
24+
merge_method: squash
25+
method: squash
26+
- name: default
27+
queue_conditions:
1128
- base~=master|integ-tests
1229
- "#approved-reviews-by>=1"
1330
- approved-reviews-by=@aws-actions/aws-ecs-devx
@@ -19,11 +36,13 @@ pull_request_rules:
1936
- -merged
2037
- -closed
2138
- author!=dependabot[bot]
22-
actions:
23-
queue:
24-
method: squash
25-
name: default
39+
merge_conditions:
40+
# Conditions to get out of the queue (= merged)
41+
- status-success=Run Unit Tests
42+
- status-success=Semantic Pull Request
43+
merge_method: squash
2644

45+
pull_request_rules:
2746
- name: Automatically approve and merge Dependabot PRs
2847
conditions:
2948
- base=master
@@ -37,6 +56,7 @@ pull_request_rules:
3756
actions:
3857
review:
3958
type: APPROVE
59+
- name: refactored queue action rule
60+
conditions: []
61+
actions:
4062
queue:
41-
method: squash
42-
name: default

0 commit comments

Comments
 (0)