Skip to content

Commit c23909d

Browse files
authored
ci(mergify): upgrade configuration to current format (#4454)
Co-authored-by: Mergify <37929162+mergify[bot]@users.noreply.github.com>
1 parent 6d0a6f2 commit c23909d

File tree

1 file changed

+9
-16
lines changed

1 file changed

+9
-16
lines changed

Diff for: .github/mergify.yml

+9-16
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,19 @@ queue_rules:
22
- name: default
33
# Mergify always respects the branch protection settings
44
# so we can left empty mergify own ones
5-
conditions: []
6-
7-
pull_request_rules:
8-
- name: Automatically merge pull requests
9-
conditions:
5+
queue_conditions:
106
- label=merge me
117
- '#approved-reviews-by>=1'
12-
actions:
13-
queue:
14-
method: squash
15-
name: default
16-
# The queue action automatically updates PRs that
17-
# have entered the queue, but in order to do that
18-
# they must have passed CI. Since our CI is a bit
19-
# flaky, PRs can fail to get in, which then means
20-
# they don't get updated, which is extra annoying.
21-
# This just adds the updating as an independent
22-
# step.
8+
merge_conditions: []
9+
merge_method: squash
10+
11+
pull_request_rules:
2312
- name: Automatically update pull requests
2413
conditions:
2514
- label=merge me
2615
actions:
2716
update:
17+
- name: refactored queue action rule
18+
conditions: []
19+
actions:
20+
queue:

0 commit comments

Comments
 (0)