ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #12391 from 0xc0170/fix_mergify_conflict 

mergify: CI only if PR is without conflicts
pull/12411/head
Martin Kojtal 2020-02-11 15:45:38 +00:00 committed by GitHub
parent 8e522056a0 59746d7397
commit 69a7d67699
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.mergify.yml
View File

@ -74,6 +74,9 @@ pull_request_rules:
- "#changes-requested-reviews-by=0"
- "#approved-reviews-by>=1"
# No conflict with the base branch
- -conflict
# CI green policy, at least Travis should be green
- status-success~=continuous-integration/travis-ci/pr
# new CI needs to be done (neutral does not work, lets check if it failed or passed, if none, we need to run again)