From a3dc01edcc2fa0b2afa4b16dc94ce833b39fb8a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Kr=C3=BCger?= <matthias.krueger@famsik.de>
Date: Fri, 5 Oct 2018 12:01:52 +0200
Subject: [PATCH] travis: reenable osx
---
.travis.yml | 11 +++++++++--
1 file 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:
- |