Skip to content

Commit 9ec10d0

Browse files
authored
Bugfix MTE-3550 Eliminating deprecated commands from Mergify (#22226)
* No deprecated commands. Intelligent guesses. Does it work? * Is this what we need instead? * Fix queue names * Remove all merge_method attributes? * Use two queues instead
1 parent c6f0ebf commit 9ec10d0

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

.mergify.yml

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
queue_rules:
2-
- name: default
3-
conditions:
2+
- name: rebase-queue
3+
queue_conditions:
4+
- check-success=Bitrise
5+
merge_method: rebase
6+
- name: squash-queue
7+
queue_conditions:
48
- check-success=Bitrise
9+
merge_method: squash
510

611
pull_request_rules:
712
- name: Resolve conflict
@@ -22,8 +27,7 @@ pull_request_rules:
2227
type: APPROVE
2328
message: Github-action[bot] 💪
2429
queue:
25-
method: rebase
26-
name: default
30+
name: rebase-queue
2731
- name: Rust Component Upgrade - Auto Merge
2832
conditions:
2933
- author=github-actions[bot]
@@ -35,8 +39,7 @@ pull_request_rules:
3539
type: APPROVE
3640
message: Github-action[bot] 💪
3741
queue:
38-
method: rebase
39-
name: default
42+
name: rebase-queue
4043
- name: L10N - Auto Merge
4144
conditions:
4245
- author=github-actions[bot]
@@ -48,8 +51,7 @@ pull_request_rules:
4851
type: APPROVE
4952
message: LGTM 😎
5053
queue:
51-
method: rebase
52-
name: default
54+
name: rebase-queue
5355
- name: Needs landing - Rebase
5456
conditions:
5557
- check-success=Bitrise
@@ -59,8 +61,7 @@ pull_request_rules:
5961
- label!=Do Not Merge ⛔️
6062
actions:
6163
queue:
62-
method: rebase
63-
name: default
64+
name: rebase-queue
6465
- name: Needs landing - Squash
6566
conditions:
6667
- check-success=Bitrise
@@ -70,5 +71,4 @@ pull_request_rules:
7071
- label!=Do Not Merge ⛔️
7172
actions:
7273
queue:
73-
method: squash
74-
name: default
74+
name: squash-queue

0 commit comments

Comments
 (0)