Skip to content

Commit 35de59a

Browse files
committed
ci(mergify): upgrade configuration to current format
1 parent d5bffbf commit 35de59a

File tree

1 file changed

+21
-59
lines changed

1 file changed

+21
-59
lines changed

.mergify/config.yml

+21-59
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,24 @@
11
queue_rules:
22
- name: default
3-
conditions:
4-
- base~=(main|0\.8\.x)
5-
6-
pull_request_rules:
7-
- name: automerge if approved and tests pass
8-
# https://docs.mergify.com/conditions/#conditions
9-
conditions:
3+
queue_conditions:
104
- "#approved-reviews-by>=1"
11-
- -closed # filter-out closed GH PRs
12-
- -conflict # skip PRs with conflicts
13-
- -draft # filter-out GH draft PRs
14-
- -label=nomerge # prevents automerge
5+
- -closed
6+
- -conflict
7+
- -draft
8+
- -label=nomerge
159
- base~=main
1610
- label=automerge
17-
actions:
18-
queue:
19-
name: default
20-
method: squash
21-
# https://docs.mergify.com/configuration/#template
22-
commit_message_template: |
23-
{{ title }} (#{{ number }})
11+
merge_conditions:
12+
- base~=(main|0\.8\.x)
13+
merge_method: squash
14+
commit_message_template: |
15+
{{ title }} (#{{ number }})
2416
25-
Approved by: @{{ approved_reviews_by | join(', @') }}
26-
============
27-
{{ body }}
17+
Approved by: @{{ approved_reviews_by | join(', @') }}
18+
============
19+
{{ body }}
2820
21+
pull_request_rules:
2922
- name: cleanup post-merge
3023
conditions:
3124
- merged
@@ -56,103 +49,72 @@ pull_request_rules:
5649
- label=automerge
5750
actions:
5851
comment:
59-
message: "[\U0001F198] @{{author}}: `{{head}}` has conflicts with `{{base}}` that must be resolved."
52+
message: "[🆘] @{{author}}: `{{head}}` has conflicts with `{{base}}` that must
53+
be resolved."
6054

6155
- name: alert on tests failure for automerge
6256
conditions:
6357
- label=automerge
6458
- status-failure=commit
6559
actions:
6660
comment:
67-
message: "[\U0001F198] @{{author}}: unable to merge due to CI failure."
61+
message: "[🆘] @{{author}}: unable to merge due to CI failure."
6862

6963
- name: auto-assign author
7064
conditions:
7165
- "#assignee=0"
7266
actions:
7367
assign:
7468
users: ["{{author}}"]
75-
76-
# ===============================================================================
77-
# LABELS
78-
# ===============================================================================
79-
# Automatically add labels when PRs match certain patterns
80-
#
81-
# NOTE:
82-
# - single quotes for regex to avoid accidental escapes
83-
# - Mergify leverages Python regular expressions to match rules.
84-
#
85-
# Semantic commit messages
86-
# - feat: new feature for the user, not a new feature for build script
87-
# - chore: updating grunt tasks etc; no production code change
88-
# - docs: changes to the documentation
89-
# - fix: bug fix for the user, not a fix to a build script
90-
# - release: increment minor/major version of our release
91-
# - rename: changes to naming conventions
92-
# - spike: research spike
93-
# - style: formatting, missing semi colons, etc; no production code change
94-
# ===============================================================================
95-
9669
- name: feature label
9770
conditions:
9871
- "head~=(?i)^feat(ure)?"
9972
actions:
10073
label:
10174
add: ["feature"]
102-
10375
- name: fix label
10476
conditions:
10577
- "head~=(?i)^(bug|hot)?fix"
10678
actions:
10779
label:
10880
add: ["fix"]
109-
11081
- name: chore label
11182
conditions:
11283
- "head~=(?i)^chore"
11384
actions:
11485
label:
11586
add: ["chore"]
116-
11787
- name: docs label
11888
conditions:
11989
- "head~=(?i)^doc"
12090
actions:
12191
label:
12292
add: ["documentation"]
123-
12493
- name: release
12594
conditions:
12695
- "head~=(?i)^rel(ease)?"
12796
actions:
12897
label:
12998
add: ["release"]
130-
13199
- name: spike
132100
conditions:
133101
- "head~=(?i)^spike"
134102
actions:
135103
label:
136104
add: ["spike"]
137-
138105
- name: rename
139106
conditions:
140107
- "head~=(?i)^rename"
141108
actions:
142109
label:
143110
add: ["rename"]
144-
145111
- name: style
146112
conditions:
147113
- "head~=(?i)^style"
148114
actions:
149115
label:
150116
add: ["style"]
151-
152-
# Refs:
153-
#
154-
# https://docs.mergify.io/getting-started/
155-
# https://docs.mergify.io/configuration/?highlight=regular%20expressions#regular-expressions
156-
# https://gist.github.com/joshbuchea/6f47e86d2510bce28f8e7f42ae84c716
157-
158-
117+
- name: refactored queue action rule
118+
conditions: []
119+
actions:
120+
queue:

0 commit comments

Comments
 (0)