Skip to content

Commit 810fbfa

Browse files
ci(mergify): upgrade configuration to current format (#345)
* ci(mergify): upgrade configuration to current format * Clean up mergify configuration update --------- Co-authored-by: Mergify <37929162+mergify[bot]@users.noreply.github.com> Co-authored-by: Daniel Flores <daflogar@amazon.com>
1 parent db70124 commit 810fbfa

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

.mergify.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
queue_rules:
22
- name: default
3-
conditions:
4-
# Conditions to get out of the queue (= merged)
3+
merge_conditions:
4+
# Conditions to get out of the queue (= merged)
55
- status-success=Run Unit Tests
66
- status-success=Semantic Pull Request
7+
merge_method: squash
78

89
pull_request_rules:
910
- name: Automatically merge on CI success and review approval
@@ -21,7 +22,6 @@ pull_request_rules:
2122
- author!=dependabot[bot]
2223
actions:
2324
queue:
24-
method: squash
2525
name: default
2626

2727
- name: Automatically approve and merge Dependabot PRs
@@ -38,5 +38,4 @@ pull_request_rules:
3838
review:
3939
type: APPROVE
4040
queue:
41-
method: squash
42-
name: default
41+
name: default

0 commit comments

Comments
 (0)