Merge pull request #3267 from matthiaskrgr/travis_osx

travis: reenable osx
This commit is contained in:
Philipp Krones 2018-10-05 14:25:30 +02:00 committed by GitHub
commit c9359566ad
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -4,7 +4,7 @@ rust: nightly
os: os:
- linux - linux
# - osx # doesn't even start atm. Not sure what travis is up to. Disabling to reduce the noise - osx
sudo: false sudo: false
@ -32,7 +32,10 @@ install:
matrix: matrix:
include: include:
- env: BASE_TESTS=true # runs the base tests - os: osx # run base tests on both platforms
env: BASE_TESTS=true
- os: linux
env: BASE_TESTS=true
- env: INTEGRATION=rust-lang/cargo - env: INTEGRATION=rust-lang/cargo
- env: INTEGRATION=rust-lang-nursery/rand - env: INTEGRATION=rust-lang-nursery/rand
- env: INTEGRATION=rust-lang-nursery/stdsimd - env: INTEGRATION=rust-lang-nursery/stdsimd
@ -46,6 +49,10 @@ matrix:
- env: INTEGRATION=serde-rs/serde - env: INTEGRATION=serde-rs/serde
- env: INTEGRATION=Geal/nom - env: INTEGRATION=Geal/nom
- env: INTEGRATION=hyperium/hyper - env: INTEGRATION=hyperium/hyper
# prevent these jobs with default env vars
exclude:
- os: linux
- os: osx
script: script:
- | - |