1
+
1
2
pull_request_rules :
2
- - name : automatic squash-merge for master when CI passes and approved
3
- conditions :
3
+ - name : automatic merge for stable when CI passes and approved + automatic squash-merge
4
+ for master when CI passes and approved
5
+ conditions : []
6
+ actions :
7
+ queue :
8
+ queue_rules :
9
+ - name : duplicated default from automatic squash-merge for master when CI passes
10
+ and approved
11
+ queue_conditions :
4
12
- " #approved-reviews-by>=1"
5
13
- and :
6
14
# Unfortunately, we cannot just say "all CI must pass".
@@ -9,13 +17,17 @@ pull_request_rules:
9
17
- check-success=docker
10
18
- check-success=SonarCloud Code Analysis
11
19
- base=master
12
- actions :
13
- queue :
14
- name : default
15
- method : squash
16
- update_method : rebase
17
- - name : automatic merge for stable when CI passes and approved
18
- conditions :
20
+ merge_conditions :
21
+ - and :
22
+ # Unfortunately, we cannot just say "all CI must pass".
23
+ # This is not a bot limitation, but a limitation in Github itself.
24
+ - check-success=all-tests
25
+ - check-success=docker
26
+ - check-success=SonarCloud Code Analysis
27
+ update_method : rebase
28
+ merge_method : squash
29
+ - name : duplicated default from automatic merge for stable when CI passes and approved
30
+ queue_conditions :
19
31
- " #approved-reviews-by>=1"
20
32
- and :
21
33
# Unfortunately, we cannot just say "all CI must pass".
@@ -24,13 +36,15 @@ pull_request_rules:
24
36
- check-success=docker
25
37
- check-success=SonarCloud Code Analysis
26
38
- base=stable
27
- actions :
28
- queue :
29
- name : default
30
- method : rebase
31
- update_method : rebase
32
-
33
- queue_rules :
39
+ merge_conditions :
40
+ - and :
41
+ # Unfortunately, we cannot just say "all CI must pass".
42
+ # This is not a bot limitation, but a limitation in Github itself.
43
+ - check-success=all-tests
44
+ - check-success=docker
45
+ - check-success=SonarCloud Code Analysis
46
+ update_method : rebase
47
+ merge_method : rebase
34
48
- name : default
35
49
conditions :
36
50
- and :
0 commit comments