Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 79 additions & 0 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
#
# Copyright 2026 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
merge_queue:
max_parallel_checks: 1

queue_rules:
- name: single-commit
autoqueue: true
batch_size: 1
merge_method: rebase
queue_conditions: &single_commit_conditions
- "base = main"
- "-draft"
- "-closed"
- "-conflict"
- "#approved-reviews-by >= 1"
- "#changes-requested-reviews-by = 0"
- "#commits = 1"
- "check-success = compile-matrix (8)"
- "check-success = compile-matrix (11)"
- "check-success = compile-matrix (17)"
- "check-success = unit-integration-pr"
- "check-success = compat-api"
- "check-success = compat-spring-spring-3.1.1-jdk8"
- "check-success = compat-spring-spring-6.1-jdk17"
- "check-success = compat-spring-boot-spring-boot-2.7-jdk8"
- "check-success = compat-spring-boot-spring-boot-3.3-jdk17"
- "check-success = compat-spring-boot-spring-boot-4.0-jdk17"
- "check-success = license"
- "check-success = CLAssistant"
merge_conditions: *single_commit_conditions

- name: multi-commit
autoqueue: true
batch_size: 1
merge_method: squash
queue_conditions: &multi_commit_conditions
- "base = main"
- "-draft"
- "-closed"
- "-conflict"
- "#approved-reviews-by >= 1"
- "#changes-requested-reviews-by = 0"
- "#commits > 1"
- "check-success = compile-matrix (8)"
- "check-success = compile-matrix (11)"
- "check-success = compile-matrix (17)"
- "check-success = unit-integration-pr"
- "check-success = compat-api"
- "check-success = compat-spring-spring-3.1.1-jdk8"
- "check-success = compat-spring-spring-6.1-jdk17"
- "check-success = compat-spring-boot-spring-boot-2.7-jdk8"
- "check-success = compat-spring-boot-spring-boot-3.3-jdk17"
- "check-success = compat-spring-boot-spring-boot-4.0-jdk17"
- "check-success = license"
- "check-success = CLAssistant"
merge_conditions: *multi_commit_conditions

pull_request_rules:
- name: notify author when PR has conflicts
conditions:
- "conflict"
- "-closed"
actions:
comment:
message: "@{{author}} This pull request has conflicts with the target branch. Please resolve them and update the branch before merging."