|
1 | 1 | queue_rules:
|
2 | 2 | - 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: |
10 | 4 | - "#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 |
15 | 9 | - base~=main
|
16 | 10 | - 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 }}) |
24 | 16 |
|
25 |
| - Approved by: @{{ approved_reviews_by | join(', @') }} |
26 |
| - ============ |
27 |
| - {{ body }} |
| 17 | + Approved by: @{{ approved_reviews_by | join(', @') }} |
| 18 | + ============ |
| 19 | + {{ body }} |
28 | 20 |
|
| 21 | +pull_request_rules: |
29 | 22 | - name: cleanup post-merge
|
30 | 23 | conditions:
|
31 | 24 | - merged
|
@@ -56,103 +49,72 @@ pull_request_rules:
|
56 | 49 | - label=automerge
|
57 | 50 | actions:
|
58 | 51 | 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." |
60 | 54 |
|
61 | 55 | - name: alert on tests failure for automerge
|
62 | 56 | conditions:
|
63 | 57 | - label=automerge
|
64 | 58 | - status-failure=commit
|
65 | 59 | actions:
|
66 | 60 | comment:
|
67 |
| - message: "[\U0001F198] @{{author}}: unable to merge due to CI failure." |
| 61 | + message: "[🆘] @{{author}}: unable to merge due to CI failure." |
68 | 62 |
|
69 | 63 | - name: auto-assign author
|
70 | 64 | conditions:
|
71 | 65 | - "#assignee=0"
|
72 | 66 | actions:
|
73 | 67 | assign:
|
74 | 68 | 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 |
| - |
96 | 69 | - name: feature label
|
97 | 70 | conditions:
|
98 | 71 | - "head~=(?i)^feat(ure)?"
|
99 | 72 | actions:
|
100 | 73 | label:
|
101 | 74 | add: ["feature"]
|
102 |
| - |
103 | 75 | - name: fix label
|
104 | 76 | conditions:
|
105 | 77 | - "head~=(?i)^(bug|hot)?fix"
|
106 | 78 | actions:
|
107 | 79 | label:
|
108 | 80 | add: ["fix"]
|
109 |
| - |
110 | 81 | - name: chore label
|
111 | 82 | conditions:
|
112 | 83 | - "head~=(?i)^chore"
|
113 | 84 | actions:
|
114 | 85 | label:
|
115 | 86 | add: ["chore"]
|
116 |
| - |
117 | 87 | - name: docs label
|
118 | 88 | conditions:
|
119 | 89 | - "head~=(?i)^doc"
|
120 | 90 | actions:
|
121 | 91 | label:
|
122 | 92 | add: ["documentation"]
|
123 |
| - |
124 | 93 | - name: release
|
125 | 94 | conditions:
|
126 | 95 | - "head~=(?i)^rel(ease)?"
|
127 | 96 | actions:
|
128 | 97 | label:
|
129 | 98 | add: ["release"]
|
130 |
| - |
131 | 99 | - name: spike
|
132 | 100 | conditions:
|
133 | 101 | - "head~=(?i)^spike"
|
134 | 102 | actions:
|
135 | 103 | label:
|
136 | 104 | add: ["spike"]
|
137 |
| - |
138 | 105 | - name: rename
|
139 | 106 | conditions:
|
140 | 107 | - "head~=(?i)^rename"
|
141 | 108 | actions:
|
142 | 109 | label:
|
143 | 110 | add: ["rename"]
|
144 |
| - |
145 | 111 | - name: style
|
146 | 112 | conditions:
|
147 | 113 | - "head~=(?i)^style"
|
148 | 114 | actions:
|
149 | 115 | label:
|
150 | 116 | 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