X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=.travis.yml;h=f5242b79d5c8d906b2be4e3f01a4cb2ca58fb55f;hb=30048222f2ce28e8d5fe4907aa63512523e4a3e1;hp=c985eccf28364817f0e909ca7d742d452a4a120b;hpb=0145ba7082705c07c331c07834050bfdf02345fe;p=rust.git

diff --git a/.travis.yml b/.travis.yml
index c985eccf283..f5242b79d5c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,7 @@
 sudo: false
 language: rust
-rust:
-# - stable
-# - beta
- - nightly
-os:
- - linux
- - osx
+rust: nightly
+os: linux
 cache:
  directories:
   - $HOME/.cargo
@@ -18,25 +13,54 @@ addons:
     - libelf-dev
     - libdw-dev
 
-before_script:
-- |
-  if [ $TRAVIS_OS_NAME = 'osx' ]; then
-    brew install python3
-    virtualenv env -p python3
-    source env/bin/activate
-    pip install 'travis-cargo<0.2'
-  else
-    pip install 'travis-cargo<0.2' --user
-    export PATH="$(python -m site --user-base)/bin:$PATH"
-  fi
+matrix:
+  include:
+    - env: DEPLOY=LINUX
+    - env: CFG_RELEASE_CHANNEL=beta
+    - os: osx
+    - env: INTEGRATION=bitflags
+    - env: INTEGRATION=cargo
+    - env: INTEGRATION=chalk
+    - env: INTEGRATION=crater
+    - env: INTEGRATION=error-chain
+    - env: INTEGRATION=failure
+    - env: INTEGRATION=futures-rs
+    - env: INTEGRATION=glob
+    - env: INTEGRATION=log
+    - env: INTEGRATION=mdbook
+    - env: INTEGRATION=packed_simd
+    - env: INTEGRATION=rand
+    - env: INTEGRATION=rust-clippy
+    - env: INTEGRATION=rust-semverver
+    - env: INTEGRATION=stdsimd
+    - env: INTEGRATION=tempdir
+  allow_failures:
+    # Needs `edition = "2018"` in rustfmt.toml
+    - env: INTEGRATION=chalk
+    # Fails tests, don't know why
+    - env: INTEGRATION=crater
+    # Doesn't build
+    - env: INTEGRATION=futures-rs
+    # Doesn't build - seems to be because of an option
+    - env: INTEGRATION=packed_simd
+    # Weird bug I can't reproduce: #2969
+    - env: INTEGRATION=rand
+    # Test failure
+    - env: INTEGRATION=rust-clippy
+    # Build failure
+    - env: INTEGRATION=rust-semverver
 
 script:
-- |
-  cargo build &&
-  cargo test
+  - |
+    if [ -z ${INTEGRATION} ]; then
+      cargo build
+      cargo test
+    else
+      ./ci/integration.sh
+    fi
 
 after_success:
-- travis-cargo coveralls --no-sudo
+- if [ -z ${INTEGRATION} ]; then travis-cargo coveralls --no-sudo; fi
 
 before_deploy:
   # TODO: cross build
@@ -52,5 +76,5 @@ deploy:
   on:
     repo: nrc/rustfmt
     tags: true
-    condition: "$TRAVIS_OS_NAME = linux"
+    condition: "$DEPLOY = LINUX"
   skip_cleanup: true