X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=.travis.yml;h=d699bd842eeccb031b041de681252282f7a229cd;hb=2b6226ce497ce9b3b9a0a3fe22a707fefcd8c2ee;hp=47f5e4eb25d68d82a783acb745bcb895e490de59;hpb=47742807f7c4078d8f78d752b647239b6b136117;p=rust.git

diff --git a/.travis.yml b/.travis.yml
index 47f5e4eb25d..d699bd842ee 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,21 +1,11 @@
 sudo: false
 language: rust
-rust:
-# - stable
-# - beta
- - nightly
-os:
- - linux
- - osx
+rust: nightly
+os: linux
 cache:
  directories:
   - $HOME/.cargo
 
-matrix:
-  include:
-    # Make sure tests will pass on beta
-    - env: CFG_RELEASE_CHANNEL=beta
-
 addons:
   apt:
     packages:
@@ -23,25 +13,51 @@ addons:
     - libelf-dev
     - libdw-dev
 
-before_script:
-- |
-  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
+matrix:
+  include:
+    - env: DEPLOY=LINUX
+    - env: CFG_RELEASE_CHANNEL=beta
+    - os: osx
+    - env: INTEGRATION=bitflags
+    - env: INTEGRATION=chalk
+    - env: INTEGRATION=crater
+    - env: INTEGRATION=error-chain
+    - env: INTEGRATION=glob
+    - env: INTEGRATION=log
+    - env: INTEGRATION=mdbook
+    - env: INTEGRATION=packed_simd
+    - env: INTEGRATION=rust-semverver
+    - env: INTEGRATION=stdsimd TARGET=x86_64-unknown-linux-gnu
+    - env: INTEGRATION=tempdir
+    - env: INTEGRATION=futures-rs
+  allow_failures:
+    # Using old configuration option
+    - env: INTEGRATION=rand
+    # Doesn't build - keep this in allow_failures as it's fragile to breaking changes of rustc.
+    - env: INTEGRATION=rust-clippy
+    # 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
+    # `cargo test` doesn't finish - disabling for now.
+    # - env: INTEGRATION=cargo
 
 script:
-- |
-  cargo build &&
-  cargo test
+  - |
+    if [ -z ${INTEGRATION} ]; then
+      export CFG_RELEASE_CHANNEL=nightly
+      export CFG_RELEASE=nightly
+      cargo build
+      cargo test
+      cargo test -- --ignored
+    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
@@ -57,5 +73,5 @@ deploy:
   on:
     repo: nrc/rustfmt
     tags: true
-    condition: "$TRAVIS_OS_NAME = linux"
+    condition: "$DEPLOY = LINUX"
   skip_cleanup: true