You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
chore(mergify): move deprecated parameters from pull_request_rules to queue_rules (#31775)
We are using deprecated parameters that are about to be removed (October 21st, 2024).
----
*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
Copy file name to clipboardExpand all lines: .mergify.yml
+18-21Lines changed: 18 additions & 21 deletions
Original file line number
Diff line number
Diff line change
@@ -1,9 +1,22 @@
1
1
# See https://doc.mergify.io
2
2
queue_rules:
3
-
- name: default
3
+
- name: default-merge
4
4
update_method: merge
5
+
merge_method: merge
5
6
conditions:
6
7
- status-success~=AWS CodeBuild us-east-1
8
+
commit_message_template: |-
9
+
{{ title }} (#{{ number }})
10
+
{{ body }}
11
+
12
+
- name: default-squash
13
+
update_method: merge
14
+
merge_method: squash
15
+
conditions:
16
+
- status-success~=AWS CodeBuild us-east-1
17
+
commit_message_template: |-
18
+
{{ title }} (#{{ number }})
19
+
{{ body }}
7
20
8
21
pull_request_rules:
9
22
- name: label core
@@ -18,11 +31,7 @@ pull_request_rules:
18
31
comment:
19
32
message: Thank you for contributing! Your pull request will be updated from main and then merged automatically (do not update manually, and be sure to [allow changes to be pushed to your fork](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/allowing-changes-to-a-pull-request-branch-created-from-a-fork)).
20
33
queue:
21
-
name: default
22
-
method: squash
23
-
commit_message_template: |-
24
-
{{ title }} (#{{ number }})
25
-
{{ body }}
34
+
name: default-squash
26
35
conditions:
27
36
- base!=release
28
37
- -title~=(WIP|wip)
@@ -41,11 +50,7 @@ pull_request_rules:
41
50
comment:
42
51
message: Thank you for contributing! Your pull request will be automatically updated and merged (do not update manually, and be sure to [allow changes to be pushed to your fork](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/allowing-changes-to-a-pull-request-branch-created-from-a-fork)).
43
52
queue:
44
-
name: default
45
-
method: squash
46
-
commit_message_template: |-
47
-
{{ title }} (#{{ number }})
48
-
{{ body }}
53
+
name: default-squash
49
54
conditions:
50
55
- base!=release
51
56
- -title~=(WIP|wip)
@@ -65,11 +70,7 @@ pull_request_rules:
65
70
comment:
66
71
message: Thank you for contributing! Your pull request will be automatically updated and merged without squashing (do not update manually, and be sure to [allow changes to be pushed to your fork](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/allowing-changes-to-a-pull-request-branch-created-from-a-fork)).
0 commit comments