Skip to content

Commit 4866294

Browse files
committed
ci(mergify): upgrade configuration to current format
1 parent 5fb24a8 commit 4866294

File tree

1 file changed

+45
-48
lines changed

1 file changed

+45
-48
lines changed

.github/mergify.yml

Lines changed: 45 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,49 @@
11
queue_rules:
2-
- name: default
3-
conditions: []
4-
5-
pull_request_rules:
6-
- name: Automatic merge on approval (main)
7-
conditions:
2+
- name: duplicated default from Automatic merge on approval (main)
3+
queue_conditions:
84
- and:
9-
- "base=main"
10-
- "#review-threads-unresolved=0"
11-
- "#approved-reviews-by>=1"
12-
- "#changes-requested-reviews-by=0"
13-
- "label!=do-not-merge"
14-
- "label!=mergify-ignore"
15-
- "check-success=ci/circleci: plugins-tests"
16-
- "check-success=ci/circleci: contracts-tests"
17-
- "check-success=ci/circleci: core-tests"
18-
- "check-success=ci/circleci: demo-tests"
19-
- "check-success=ci/circleci: executor-tests"
20-
- "check-success=ci/circleci: yarn-monorepo"
21-
- "check-success=license/cla"
22-
actions:
23-
queue:
24-
name: default
25-
method: merge
26-
27-
- name: Automatic merge on approval (develop)
28-
conditions:
5+
- "base=main"
6+
- "#review-threads-unresolved=0"
7+
- "#approved-reviews-by>=1"
8+
- "#changes-requested-reviews-by=0"
9+
- "label!=do-not-merge"
10+
- "label!=mergify-ignore"
11+
- "check-success=ci/circleci: plugins-tests"
12+
- "check-success=ci/circleci: contracts-tests"
13+
- "check-success=ci/circleci: core-tests"
14+
- "check-success=ci/circleci: demo-tests"
15+
- "check-success=ci/circleci: executor-tests"
16+
- "check-success=ci/circleci: yarn-monorepo"
17+
- "check-success=license/cla"
18+
merge_conditions: []
19+
merge_method: merge
20+
- name: duplicated default from Automatic merge on approval (develop)
21+
queue_conditions:
2922
- and:
30-
- "base=develop"
31-
- "#review-threads-unresolved=0"
32-
- "#approved-reviews-by>=1"
33-
- "#changes-requested-reviews-by=0"
34-
- "label!=do-not-merge"
35-
- "label!=mergify-ignore"
36-
- "check-success=ci/circleci: plugins-tests"
37-
- "check-success=ci/circleci: contracts-tests"
38-
- "check-success=ci/circleci: core-tests"
39-
- "check-success=ci/circleci: demo-tests"
40-
- "check-success=ci/circleci: executor-tests"
41-
- "check-success=ci/circleci: yarn-monorepo"
42-
- "check-success=license/cla"
43-
actions:
44-
queue:
45-
name: default
46-
method: squash
23+
- "base=develop"
24+
- "#review-threads-unresolved=0"
25+
- "#approved-reviews-by>=1"
26+
- "#changes-requested-reviews-by=0"
27+
- "label!=do-not-merge"
28+
- "label!=mergify-ignore"
29+
- "check-success=ci/circleci: plugins-tests"
30+
- "check-success=ci/circleci: contracts-tests"
31+
- "check-success=ci/circleci: core-tests"
32+
- "check-success=ci/circleci: demo-tests"
33+
- "check-success=ci/circleci: executor-tests"
34+
- "check-success=ci/circleci: yarn-monorepo"
35+
- "check-success=license/cla"
36+
merge_conditions: []
37+
merge_method: squash
4738

39+
pull_request_rules:
4840
- name: Add merge train label
4941
conditions:
5042
- "queue-position >= 0"
5143
actions:
5244
comment:
53-
message: |
54-
This PR has been added to the merge queue, and will be merged soon.
45+
message: |
46+
This PR has been added to the merge queue, and will be merged soon.
5547
label:
5648
add:
5749
- on-merge-train
@@ -69,7 +61,8 @@ pull_request_rules:
6961
- conflict
7062
actions:
7163
comment:
72-
message: Hey @{{author}}! This PR has merge conflicts. Please fix them before continuing review.
64+
message: Hey @{{author}}! This PR has merge conflicts. Please fix them before
65+
continuing review.
7366
label:
7467
add:
7568
- conflict
@@ -101,9 +94,13 @@ pull_request_rules:
10194
- name: Nag changesets
10295
conditions:
10396
- and:
104-
- 'files~=\.((?<!\.spec\.)ts|js|sol)$'
105-
- '-files~=^\.changeset/(.*)\.md'
97+
- 'files~=\.((?<!\.spec\.)ts|js|sol)$'
98+
- '-files~=^\.changeset/(.*)\.md'
10699
actions:
107100
comment:
108101
message: |
109102
This PR changes implementation code, but doesn't include a changeset. Did you forget to add one?
103+
- name: Automatic merge on approval (develop) + Automatic merge on approval (main)
104+
conditions: []
105+
actions:
106+
queue:

0 commit comments

Comments
 (0)