Skip to content

Commit 13283e9

Browse files
jxskamsz
authored andcommitted
update script for new mergify syntax (sigp#6597)
1 parent 49fa648 commit 13283e9

File tree

1 file changed

+38
-4
lines changed

1 file changed

+38
-4
lines changed

.github/mergify.yml

Lines changed: 38 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,36 @@
1+
pull_request_rules:
2+
- name: Ask to resolve conflict
3+
conditions:
4+
- conflict
5+
- -author=dependabot[bot]
6+
- or:
7+
- -draft # Don't report conflicts on regular draft.
8+
- and: # Do report conflicts on draft that are scheduled for the next major release.
9+
- draft
10+
- milestone~=v[0-9]\.[0-9]{2}
11+
actions:
12+
comment:
13+
message: This pull request has merge conflicts. Could you please resolve them
14+
@{{author}}? 🙏
15+
16+
- name: Approve trivial maintainer PRs
17+
conditions:
18+
- base=master
19+
- label=trivial
20+
- author=@sigp/lighthouse
21+
actions:
22+
review:
23+
type: APPROVE
24+
25+
- name: Add ready-to-merge labeled PRs to merge queue
26+
conditions:
27+
# All branch protection rules are implicit: https://docs.mergify.com/conditions/#about-branch-protection
28+
- base=master
29+
- label=send-it
30+
actions:
31+
queue:
32+
33+
134
queue_rules:
235
- name: default
336
batch_size: 8
@@ -6,10 +39,11 @@ queue_rules:
639
merge_method: squash
740
commit_message_template: |
841
{{ title }} (#{{ number }})
9-
10-
{% for commit in commits %}
11-
* {{ commit.commit_message }}
12-
{% endfor %}
42+
43+
{{ body | get_section("## Issue Addressed", "") }}
44+
45+
46+
{{ body | get_section("## Proposed Changes", "") }}
1347
queue_conditions:
1448
- "#approved-reviews-by >= 1"
1549
- "check-success=license/cla"

0 commit comments

Comments
 (0)