a2a9512afa
In the past we had strict mode in branch protection. This didn't really work as it broke mergify. Now mergify supports this options and takes care of the merging automatically. Let's see how it goes ;) Reason is the recent build failures we had on master, during a busy merge day. This could have been prevented if sequential PR's where re-merging with master. More info: https://doc.mergify.io/strict-workflow.html
19 lines
572 B
YAML
19 lines
572 B
YAML
pull_request_rules:
|
|
- name: Successful travis and 2 approved reviews
|
|
conditions:
|
|
- status-success=continuous-integration/travis-ci/pr
|
|
- "#approved-reviews-by>=2"
|
|
actions:
|
|
merge:
|
|
method: merge
|
|
strict: true
|
|
- name: Trusted author, successful travis and 1 approved review
|
|
conditions:
|
|
- author~=(kaiyou|muhlemmer|mildred|HorayNarea|adi90x|hoellen|ofthesun9)
|
|
- status-success=continuous-integration/travis-ci/pr
|
|
- "#approved-reviews-by>=1"
|
|
actions:
|
|
merge:
|
|
method: merge
|
|
strict: true
|