Merge pull request #3242 from matthiaskrgr/rm_cargo_ed_feat

[rust.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index c6bd67ae0f3df6ffed8283d7a9f74fa0236f3cbf..948eb23fe83d1ccb756161bed8c1a5b3ed7f473a 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,8 +10,6 @@ sudo: false
 
 env:
  global:
-   # TRAVIS_TOKEN_CLIPPY_SERVICE
-   - secure: dj8SwwuRGuzbo2wZq5z7qXIf7P3p7cbSGs1I3pvXQmB6a58gkLiRn/qBcIIegdt/nzXs+Z0Nug+DdesYVeUPxk1hIa/eeU8p6mpyTtZ+30H4QVgVzd0VCthB5F/NUiPVxTgpGpEgCM9/p72xMwTn7AAJfsGqk7AJ4FS5ZZKhqFI=
    - RUST_BACKTRACE=1
 
 before_install:
@@ -50,11 +48,20 @@ matrix:
     - env: INTEGRATION=hyperium/hyper
 
 script:
+  - |
+      rm rust-toolchain
+      cargo install rustup-toolchain-install-master || echo "rustup-toolchain-install-master already installed"
+      RUSTC_HASH=$(git ls-remote https://github.com/rust-lang/rust.git master | awk '{print $1}')
+      travis_retry rustup-toolchain-install-master -f -n master $RUSTC_HASH
+      rustup default master
+      export LD_LIBRARY_PATH=$(rustc --print sysroot)/lib
   - |
     if [ -z ${INTEGRATION} ]; then
       ./ci/base-tests.sh
+      sleep 5
     else
       ./ci/integration-tests.sh
+      sleep 5
     fi
 
 after_success: |
@@ -66,20 +73,5 @@ after_success: |
     else
       echo "Not deploying, because we're in an integration test run"
     fi
-    # trigger rebuild of the clippy-service, to keep it up to date with clippy itself
-    if [ "$TRAVIS_PULL_REQUEST" == "false" ] &&
-       [ "$TRAVIS_REPO_SLUG" == "Manishearth/rust-clippy" ] &&
-       [ "$TRAVIS_BRANCH" == "master" ] &&
-       [ "$TRAVIS_TOKEN_CLIPPY_SERVICE" != "" ] ; then
-       curl -s -X POST \
-          -H "Content-Type: application/json" \
-          -H "Accept: application/json" \
-          -H "Travis-API-Version: 3" \
-          -H "Authorization: token $TRAVIS_TOKEN_CLIPPY_SERVICE" \
-          -d "{ \"request\": { \"branch\":\"master\" }}" \
-          https://api.travis-ci.org/repo/gnunicorn%2Fclippy-service/requests
-    else
-      echo "Ignored"
-    fi
     set +e
   fi