Auto merge of #780 - RalfJung:ci, r=RalfJung

adapt CI for bors

With this, we should run the Travis tests (Linux+macOS) in PRs, and run that plus AppVeyor in bors.
This commit is contained in:
bors 2019-06-21 19:03:00 +00:00
commit deccfa4dd8
2 changed files with 7 additions and 1 deletions

View file

@ -9,7 +9,8 @@ environment:
branches:
# whitelist
only:
- master
- auto
- try
cache:
- '%USERPROFILE%\.cargo'

View file

@ -12,6 +12,9 @@ os:
- osx
dist: xenial
# Run in PRs and for bors, but not on master.
if: branch = auto OR branch = try OR type = pull_request
env:
global:
- RUST_TEST_NOCAPTURE=1
@ -53,3 +56,5 @@ notifications:
branches:
only:
- master
- auto
- try