Skip to content

Commit db7af8a

Browse files
authored
Merge pull request #10879 from haskell/mergify/configuration-deprecated-update
ci(mergify): upgrade configuration to current format
2 parents e765b64 + a1a88ca commit db7af8a

File tree

1 file changed

+19
-10
lines changed

1 file changed

+19
-10
lines changed

.github/mergify.yml

+19-10
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,26 @@ priority_rules:
66
- name: high priority
77
conditions:
88
- 'label=priority: high :fire:'
9-
priority: high
9+
priority: 3000
1010

1111
# The idea is we slightly prioritize those PRs because we're in
1212
# a release cycle if a PR matches.
1313
- name: release branch
1414
conditions:
1515
- 'base~=^3\.'
1616
- 'label!=backport'
17-
# 'normal' is 2000, 'high' is 3000
1817
priority: 2500
1918

19+
- name: priority for queue `default`
20+
conditions:
21+
- queue-name=default
22+
priority: 2250
23+
24+
- name: priority for queue `squash-merge`
25+
conditions:
26+
- queue-name=squash-merge
27+
priority: 2250
28+
2029
pull_request_rules:
2130

2231
# implementing PR delay logic: apply a label after 2 days of inactivity
@@ -28,12 +37,12 @@ pull_request_rules:
2837
name: Wait for 2 days before validating merge
2938
conditions:
3039
- or:
31-
- 'label=priority: high :fire:'
32-
- updated-at<2 days ago
40+
- 'label=priority: high :fire:'
41+
- updated-at<2 days ago
3342
- or:
34-
- label=merge me
35-
- label=squash+merge me
36-
- label=merge+no rebase
43+
- label=merge me
44+
- label=squash+merge me
45+
- label=merge+no rebase
3746
- '#approved-reviews-by>=2'
3847

3948
# label when Mergify is ready but waiting for the above
@@ -47,9 +56,9 @@ pull_request_rules:
4756
- -draft
4857
- -closed
4958
- or:
50-
- label=merge me
51-
- label=squash+merge me
52-
- label=merge+no rebase
59+
- label=merge me
60+
- label=squash+merge me
61+
- label=merge+no rebase
5362
- '#approved-reviews-by>=2'
5463
- '#changes-requested-reviews-by=0'
5564
# oy

0 commit comments

Comments
 (0)