Skip to content

Commit c89320a

Browse files
committed
ci: add mergify merge queue config
1 parent 5a3fec9 commit c89320a

File tree

1 file changed

+79
-0
lines changed

1 file changed

+79
-0
lines changed

.mergify.yml

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
#
2+
# Copyright 2026 Apollo Authors
3+
#
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
#
16+
merge_queue:
17+
max_parallel_checks: 1
18+
19+
queue_rules:
20+
- name: single-commit
21+
autoqueue: true
22+
batch_size: 1
23+
merge_method: rebase
24+
queue_conditions: &single_commit_conditions
25+
- "base = main"
26+
- "-draft"
27+
- "-closed"
28+
- "-conflict"
29+
- "#approved-reviews-by >= 1"
30+
- "#changes-requested-reviews-by = 0"
31+
- "#commits = 1"
32+
- "check-success = compile-matrix (8)"
33+
- "check-success = compile-matrix (11)"
34+
- "check-success = compile-matrix (17)"
35+
- "check-success = unit-integration-pr"
36+
- "check-success = compat-api"
37+
- "check-success = compat-spring-spring-3.1.1-jdk8"
38+
- "check-success = compat-spring-spring-6.1-jdk17"
39+
- "check-success = compat-spring-boot-spring-boot-2.7-jdk8"
40+
- "check-success = compat-spring-boot-spring-boot-3.3-jdk17"
41+
- "check-success = compat-spring-boot-spring-boot-4.0-jdk17"
42+
- "check-success = license"
43+
- "check-success = CLAssistant"
44+
merge_conditions: *single_commit_conditions
45+
46+
- name: multi-commit
47+
autoqueue: true
48+
batch_size: 1
49+
merge_method: squash
50+
queue_conditions: &multi_commit_conditions
51+
- "base = main"
52+
- "-draft"
53+
- "-closed"
54+
- "-conflict"
55+
- "#approved-reviews-by >= 1"
56+
- "#changes-requested-reviews-by = 0"
57+
- "#commits > 1"
58+
- "check-success = compile-matrix (8)"
59+
- "check-success = compile-matrix (11)"
60+
- "check-success = compile-matrix (17)"
61+
- "check-success = unit-integration-pr"
62+
- "check-success = compat-api"
63+
- "check-success = compat-spring-spring-3.1.1-jdk8"
64+
- "check-success = compat-spring-spring-6.1-jdk17"
65+
- "check-success = compat-spring-boot-spring-boot-2.7-jdk8"
66+
- "check-success = compat-spring-boot-spring-boot-3.3-jdk17"
67+
- "check-success = compat-spring-boot-spring-boot-4.0-jdk17"
68+
- "check-success = license"
69+
- "check-success = CLAssistant"
70+
merge_conditions: *multi_commit_conditions
71+
72+
pull_request_rules:
73+
- name: notify author when PR has conflicts
74+
conditions:
75+
- "conflict"
76+
- "-closed"
77+
actions:
78+
comment:
79+
message: "@{{author}} This pull request has conflicts with the target branch. Please resolve them and update the branch before merging."

0 commit comments

Comments
 (0)