Skip to content

Commit 16f052e

Browse files
mergify[bot]s3cubedani-chmbomkhegde
authored
ci(mergify): upgrade configuration to current format (#686)
ci(mergify): upgrade configuration to current format Co-authored-by: Mergify <37929162+mergify[bot]@users.noreply.github.com> Co-authored-by: Satej <[email protected]> Co-authored-by: Daniel Flores <[email protected]> Co-authored-by: Omkar Hegde <[email protected]>
1 parent e4d9480 commit 16f052e

File tree

2 files changed

+147
-77
lines changed

2 files changed

+147
-77
lines changed

.mergify.yml

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
queue_rules:
22
- name: default
3-
conditions:
3+
merge_conditions:
44
# Conditions to get out of the queue (= merged)
55
- status-success=Run Unit Tests
66
- status-success=Semantic Pull Request
77
- status-success=Analyze (javascript)
8+
merge_method: squash
89

910
pull_request_rules:
1011
- name: Automatically merge on CI success and review approval
@@ -23,7 +24,6 @@ pull_request_rules:
2324
- author!=dependabot[bot]
2425
actions:
2526
queue:
26-
method: squash
2727
name: default
2828

2929
- name: Automatically approve and merge Dependabot PRs
@@ -41,5 +41,4 @@ pull_request_rules:
4141
review:
4242
type: APPROVE
4343
queue:
44-
method: squash
45-
name: default
44+
name: default

0 commit comments

Comments
 (0)