diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2018-10-05 12:01:52 +0200 |
|---|---|---|
| committer | Matthias Krüger <matthias.krueger@famsik.de> | 2018-10-05 13:50:09 +0200 |
| commit | a3dc01edcc2fa0b2afa4b16dc94ce833b39fb8a2 (patch) | |
| tree | dd9385ac68861ee28765dcfac94fac29e3c4fd3d | |
| parent | eb2cfe62b523c34dc2ec5990b0113001c936db7e (diff) | |
| download | rust-a3dc01edcc2fa0b2afa4b16dc94ce833b39fb8a2.tar.gz rust-a3dc01edcc2fa0b2afa4b16dc94ce833b39fb8a2.zip | |
travis: reenable osx
| -rw-r--r-- | .travis.yml | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 8aff93d480a..6d44c7faa93 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ rust: nightly os: - linux - # - osx # doesn't even start atm. Not sure what travis is up to. Disabling to reduce the noise + - osx sudo: false @@ -32,7 +32,10 @@ install: matrix: 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-nursery/rand - env: INTEGRATION=rust-lang-nursery/stdsimd @@ -46,6 +49,10 @@ matrix: - env: INTEGRATION=serde-rs/serde - env: INTEGRATION=Geal/nom - env: INTEGRATION=hyperium/hyper +# prevent these jobs with default env vars + exclude: + - os: linux + - os: osx script: - | |