Skip to content

Commit 7815144

Browse files
authored
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*
1 parent 2ae6bd4 commit 7815144

File tree

1 file changed

+18
-21
lines changed

1 file changed

+18
-21
lines changed

.mergify.yml

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,22 @@
11
# See https://doc.mergify.io
22
queue_rules:
3-
- name: default
3+
- name: default-merge
44
update_method: merge
5+
merge_method: merge
56
conditions:
67
- 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 }}
720
821
pull_request_rules:
922
- name: label core
@@ -18,11 +31,7 @@ pull_request_rules:
1831
comment:
1932
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)).
2033
queue:
21-
name: default
22-
method: squash
23-
commit_message_template: |-
24-
{{ title }} (#{{ number }})
25-
{{ body }}
34+
name: default-squash
2635
conditions:
2736
- base!=release
2837
- -title~=(WIP|wip)
@@ -41,11 +50,7 @@ pull_request_rules:
4150
comment:
4251
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)).
4352
queue:
44-
name: default
45-
method: squash
46-
commit_message_template: |-
47-
{{ title }} (#{{ number }})
48-
{{ body }}
53+
name: default-squash
4954
conditions:
5055
- base!=release
5156
- -title~=(WIP|wip)
@@ -65,11 +70,7 @@ pull_request_rules:
6570
comment:
6671
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)).
6772
queue:
68-
name: default
69-
method: merge
70-
commit_message_template: |-
71-
{{ title }} (#{{ number }})
72-
{{ body }}
73+
name: default-merge
7374
conditions:
7475
- -title~=(WIP|wip)
7576
- -label~=(blocked|do-not-merge)
@@ -112,11 +113,7 @@ pull_request_rules:
112113
comment:
113114
message: Thanks Dependabot!
114115
queue:
115-
name: default
116-
method: squash
117-
commit_message_template: |-
118-
{{ title }} (#{{ number }})
119-
{{ body }}
116+
name: default-squash
120117
conditions:
121118
- -title~=(WIP|wip)
122119
- -label~=(blocked|do-not-merge)

0 commit comments

Comments
 (0)