Merge pull request #3242 from matthiaskrgr/rm_cargo_ed_feat

[rust.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 069336c69641fcfd0c49d7711a1ae46fdb583159..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:
@@ -24,48 +22,56 @@ before_install:
     fi
 
 install:
-  - . $HOME/.nvm/nvm.sh
-  - nvm install stable
-  - nvm use stable
-  - npm install remark-cli remark-lint
+  - |
+    if [ -z ${INTEGRATION} ]; then
+      . $HOME/.nvm/nvm.sh
+      nvm install stable
+      nvm use stable
+      npm install remark-cli remark-lint
+    fi
+
+matrix:
+  include:
+    - env: BASE_TESTS=true # runs the base tests
+    - env: INTEGRATION=rust-lang/cargo
+    - env: INTEGRATION=rust-lang-nursery/rand
+    - env: INTEGRATION=rust-lang-nursery/stdsimd
+    - env: INTEGRATION=rust-lang-nursery/rustfmt
+    - env: INTEGRATION=rust-lang-nursery/futures-rs
+    - env: INTEGRATION=rust-lang-nursery/failure
+    - env: INTEGRATION=rust-lang-nursery/log
+    - env: INTEGRATION=rust-lang-nursery/chalk
+    - env: INTEGRATION=rust-lang-nursery/rls
+    - env: INTEGRATION=chronotope/chrono
+    - env: INTEGRATION=serde-rs/serde
+    - env: INTEGRATION=Geal/nom
+    - env: INTEGRATION=hyperium/hyper
 
 script:
- - PATH=$PATH:./node_modules/.bin
- - remark -f README.md > /dev/null
- - set -e
- - cargo build --features debugging
- - cargo test --features debugging
- - mkdir -p ~/rust/cargo/bin
- - cp target/debug/cargo-clippy ~/rust/cargo/bin/cargo-clippy
- - cp target/debug/clippy-driver ~/rust/cargo/bin/clippy-driver
- - PATH=$PATH:~/rust/cargo/bin cargo clippy --all -- -D clippy
- - cd clippy_workspace_tests && PATH=$PATH:~/rust/cargo/bin cargo clippy -- -D clippy && cd ..
- - cd clippy_workspace_tests/src && PATH=$PATH:~/rust/cargo/bin cargo clippy -- -D clippy && cd ../..
- - cd clippy_workspace_tests/subcrate && PATH=$PATH:~/rust/cargo/bin cargo clippy -- -D clippy && cd ../..
- - cd clippy_workspace_tests/subcrate/src && PATH=$PATH:~/rust/cargo/bin cargo clippy -- -D clippy && cd ../../..
- - PATH=$PATH:~/rust/cargo/bin cargo clippy --manifest-path=clippy_workspace_tests/Cargo.toml -- -D clippy
- - cd clippy_workspace_tests/subcrate && PATH=$PATH:~/rust/cargo/bin cargo clippy --manifest-path=../Cargo.toml -- -D clippy && cd ../..
- - set +e
+  - |
+      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: |
   #!/bin/bash
   if [ $(uname) == Linux ]; then
-    set -e
-    ./.github/deploy.sh
-    # 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
+    set -ex
+    if [ -z ${INTEGRATION} ]; then
+      ./.github/deploy.sh
     else
-      echo "Ignored"
+      echo "Not deploying, because we're in an integration test run"
     fi
     set +e
   fi