Support path-clarity submodule

[rust.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index c0fefbbbb2845801eaffd841b267a4cfef44e7e8..741103b93a4eb24641cdc42e38d32113d711edea 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,49 +18,28 @@ matrix:
     - env: DEPLOY=LINUX
     - env: CFG_RELEASE_CHANNEL=beta
     - os: osx
+    - env: INTEGRATION=bitflags
     - env: INTEGRATION=cargo
-    - env: INTEGRATION=rust-clippy
-    - env: INTEGRATION=mdbook
-    - env: INTEGRATION=stdsimd
-    - env: INTEGRATION=rust-semverver
     - env: INTEGRATION=chalk
     - env: INTEGRATION=crater
-    - env: INTEGRATION=futures-rs
-    - env: INTEGRATION=rand
-    - env: INTEGRATION=failure
-    - env: INTEGRATION=glob
     - env: INTEGRATION=error-chain
-    - env: INTEGRATION=tempdir
-    - env: INTEGRATION=bitflags
+    - env: INTEGRATION=glob
     - env: INTEGRATION=log
-  allow_failures:
-    - env: INTEGRATION=cargo
-    - env: INTEGRATION=stdsimd
     - env: INTEGRATION=mdbook
-    - env: INTEGRATION=crater
-    - env: INTEGRATION=rust-semverver
+    - env: INTEGRATION=packed_simd
+    - env: INTEGRATION=rand
     - env: INTEGRATION=rust-clippy
-    - env: INTEGRATION=chalk
-    - env: INTEGRATION=bitflags
-    - env: INTEGRATION=error-chain
-    - env: INTEGRATION=failure
+    - env: INTEGRATION=rust-semverver
+    - env: INTEGRATION=stdsimd TARGET=x86_64-unknown-linux-gnu
+    - env: INTEGRATION=tempdir
     - env: INTEGRATION=futures-rs
-    - env: INTEGRATION=log
-    - env: INTEGRATION=rand
-
-before_script:
-- |
-  if [ -z ${INTEGRATION} ]; then
-    if [ $TRAVIS_OS_NAME = 'osx' ]; then
-      virtualenv env &&
-      source env/bin/activate &&
-      python --version &&
-      pip install 'travis-cargo<0.2'
-    else
-      pip install 'travis-cargo<0.2' --user &&
-      export PATH="$(python -m site --user-base)/bin:$PATH"
-    fi
-  fi
+  allow_failures:
+    # Doesn't build - seems to be because of an option
+    - env: INTEGRATION=packed_simd
+    # Doesn't build - a temporal build failure due to breaking changes in the nightly compilre
+    - env: INTEGRATION=rust-semverver
+    # can be moved back to include section after https://github.com/rust-lang-nursery/failure/pull/298 is merged
+    - env: INTEGRATION=failure
 
 script:
   - |