Skip to content

Commit f0f5315

Browse files
committed
ci(Mergify): configuration update
Signed-off-by: Andrei Neagu <null>
1 parent 6e5ae15 commit f0f5315

File tree

1 file changed

+10
-16
lines changed

1 file changed

+10
-16
lines changed

.github/mergify.yml

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,31 @@
11
queue_rules:
22
- name: default
33
queue_conditions:
4-
# general prerequisits fo accept the PR in the queue
5-
- label=🤖-automerge # let Mergify know that the PR can be merged (added manually)
6-
- label!=🤖-do-not-merge # block Mergify from merging the PR (added manually)
4+
- label=🤖-automerge
5+
- label!=🤖-do-not-merge
76
- base=master
8-
- -draft # PR is not in draft state
9-
- -conflict # No merge conflicts
10-
11-
# Check for required reviews
12-
- "#approved-reviews-by>=2" # Requires 2 approving reviews
13-
- "#changes-requested-reviews-by=0" # No changes requested
14-
- "#review-threads-unresolved=0" # All review threads resolved
15-
7+
- -draft
8+
- -conflict
9+
- "#approved-reviews-by>=2"
10+
- "#changes-requested-reviews-by=0"
11+
- "#review-threads-unresolved=0"
1612
merge_conditions:
17-
# list of CI checks that need to pass
1813
- check-success=unit-tests
1914
- check-success=integration-tests
2015
- check-success=system-tests
21-
16+
branch_protection_injection_mode: merge
2217
pull_request_rules:
2318
- name: update branch if behind master
2419
conditions:
25-
- queue-name=default # only run if already queued
20+
- queue-name=default
2621
- label=🤖-automerge
2722
- label!=🤖-do-not-merge
2823
- base=master
2924
actions:
3025
update:
31-
3226
- name: retry CI on fails (used for flaky tests)
3327
conditions:
34-
- queue-name=default # only run if already queued
28+
- queue-name=default
3529
- label=🤖-automerge
3630
- label!=🤖-do-not-merge
3731
- base=master

0 commit comments

Comments
 (0)