]> git.lizzy.rs Git - rust.git/blobdiff - .travis.yml
Update const slice processing
[rust.git] / .travis.yml
index b3331c8a26d80fdc06dfda9154dd13f127059c2c..d456497d99722bc8347c29bb331314d26040bc1e 100644 (file)
@@ -18,19 +18,10 @@ env:
  global:
    - RUST_BACKTRACE=1
 
-before_install:
- - |
-    # work-around for issue https://github.com/travis-ci/travis-ci/issues/6307
-    # might not be necessary in the future
-    if [ "$TRAVIS_OS_NAME" == "osx" ]; then
-     command curl -sSL https://rvm.io/mpapis.asc | gpg --import -
-     rvm get stable
-    fi
-
 install:
   - |
     if [ -z ${INTEGRATION} ]; then
-      rustup component add rustfmt-preview || cargo install --git https://github.com/rust-lang/rustfmt/ --force
+      rustup component add rustfmt || cargo install --git https://github.com/rust-lang/rustfmt/ --force
       if [ "$TRAVIS_OS_NAME" == "linux" ]; then
         . $HOME/.nvm/nvm.sh
         nvm install stable
@@ -46,6 +37,7 @@ install:
 # if: fork = false
 # but this is currently buggy travis-ci/travis-ci#9118
 matrix:
+  fast_finish: true
   include:
     - os: osx # run base tests on both platforms
       env: BASE_TESTS=true
@@ -79,6 +71,8 @@ matrix:
       if: repo =~ /^rust-lang\/rust-clippy$/
     - env: INTEGRATION=hyperium/hyper
       if: repo =~ /^rust-lang\/rust-clippy$/
+    - env: INTEGRATION=bluss/rust-itertools
+      if: repo =~ /^rust-lang\/rust-clippy$/
   allow_failures:
   - os: windows
     env: CARGO_INCREMENTAL=0 BASE_TESTS=true