Skip to content

Commit 49959e4

Browse files
authored
ci(mergify): upgrade configuration to current format
1 parent f1b55bd commit 49959e4

1 file changed

Lines changed: 12 additions & 12 deletions

File tree

.mergify.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ pull_request_rules:
3333
- "#approved-reviews-by >= 1"
3434
- or:
3535
- and:
36-
- label=ok-to-merge
37-
- label=squash
36+
- label=ok-to-merge
37+
- label=squash
3838
- label=ok-to-squash
3939
- -label=wip
4040
- -label=do-not-merge/hold
@@ -139,7 +139,7 @@ pull_request_rules:
139139
❗❗❗
140140
All commits in this PR must be signed off.
141141
Please sign all commits by:
142-
142+
143143
```shell
144144
git rebase HEAD~{{ commits | length }} --signoff
145145
git push --force-with-lease origin {{ head }}
@@ -149,26 +149,26 @@ merge_protections:
149149
description: Make sure that we follow https://www.conventionalcommits.org/en/v1.0.0/
150150
if:
151151
- or:
152-
- base=main
153-
- base~=^release\/v
152+
- base=main
153+
- base~=^release\/v
154154
success_conditions:
155-
- "title ~= ^(\\[wip\\]|\\[backport\\]|\\[cherry-pick\\])?(
156-
)?(fix|feat|docs|style|refactor|perf|test|build|ci|chore|revert)(?:\\(.+\
157-
\\))?:"
155+
- "title ~= ^(\\[wip\\]|\\[backport\\]|\\[cherry-pick\\])?( )?(fix|feat|docs|style|refactor|perf|test|build|ci|chore|revert)(?:\\(.+\\))?:"
158156
- name: Enforce verified commits
159157
description: Make sure that we have verified commits
160158
if:
161159
- or:
162-
- base=main
163-
- base~=^release\/v
160+
- base=main
161+
- base~=^release\/v
164162
success_conditions:
165163
- "#commits-unverified = 0"
166164
- name: Enforce linear history
167165
description: Make sure that we have a linear history, no merge commits are allowed
168166
if:
169167
- or:
170-
- base=main
171-
- base~=^release\/v
168+
- base=main
169+
- base~=^release\/v
172170
success_conditions:
173171
- "linear-history"
174172

173+
merge_protections_settings:
174+
reporting_method: check-runs

0 commit comments

Comments
 (0)