apollo-java/.mergify.yml at main · apolloconfig/apollo-java · GitHub

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
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."