Fix lint_without_lint_pass lint

[rust.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 4ca18a93ea86e56fe3aeec5f0736bbf37f225587..64036ec3aa3a183c9f2b08c384b44121bbd29337 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,5 @@
-language: rust
-
-rust: nightly
-
-os:
-  - linux
-  - osx
-  - windows
+dist: xenial
+language: bash
 
 branches:
   # Don't build these branches
@@ -14,22 +8,34 @@ branches:
     - trying.tmp
     - staging.tmp
 
+cache:
+  directories:
+    - $HOME/.cargo
+before_cache:
+  - cargo install -Z install-upgrade cargo-cache --debug
+  - cargo cache --autoclean
+
 env:
  global:
    - RUST_BACKTRACE=1
+   - secure: "OKulfkA5OGd/d1IhvBKzRkHQwMcWjzrzbimo7+5NhkUkWxndAzl+719TB3wWvIh1i2wXXrEXsyZkXM5FtRrHm55v1VKQ5ibjEvFg1w3NIg81iDyoLq186fLqywvxGkOAFPrsePPsBj5USd5xvhwwbrjO6L7/RK6Z8shBwOSc41s="
 
+before_install:
+  - curl -sSL https://sh.rustup.rs | sh -s -- -y --default-toolchain=nightly --profile=minimal
+  - export PATH="$HOME/.cargo/bin:$PATH"
 install:
   - |
-    if [ -z ${INTEGRATION} ]; then
-      rustup component add rustfmt || cargo install --git https://github.com/rust-lang/rustfmt/ --force
-      if [ "$TRAVIS_OS_NAME" == "linux" ]; then
+    if [[ -z ${INTEGRATION} ]]; then
+      if ! rustup component add rustfmt; then
+        cargo install -Z install-upgrade --git https://github.com/rust-lang/rustfmt --bin rustfmt
+      fi
+      if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
         . $HOME/.nvm/nvm.sh
         nvm install stable
         nvm use stable
         npm install remark-cli remark-lint
-      fi
-      if [ "$TRAVIS_OS_NAME" == "windows" ]; then
-        choco install windows-sdk-10.0
+      elif [[ "$TRAVIS_OS_NAME" == "windows" ]]; then
+        choco install windows-sdk-10.1
       fi
     fi
 
@@ -41,11 +47,9 @@ matrix:
   include:
     # Builds that are executed for every PR
     - os: osx # run base tests on both platforms
-      env: BASE_TESTS=true
     - os: linux
-      env: BASE_TESTS=true
     - os: windows
-      env: CARGO_INCREMENTAL=0 BASE_TESTS=true
+      env: CARGO_INCREMENTAL=0 OS_WINDOWS=true
 
     # Builds that are only executed when a PR is r+ed or a try build is started
     # We don't want to run these always because they go towards
@@ -82,34 +86,55 @@ matrix:
     - env: INTEGRATION=chronotope/chrono
       if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
   allow_failures:
-  - os: windows
-    env: CARGO_INCREMENTAL=0 BASE_TESTS=true
-# prevent these jobs with default env vars
-  exclude:
-    - os: linux
-    - os: osx
     - os: windows
+      env: CARGO_INCREMENTAL=0 OS_WINDOWS=true
 
-script:
+before_script:
   - |
-      rm rust-toolchain
-      ./setup-toolchain.sh
-      export LD_LIBRARY_PATH=$(rustc --print sysroot)/lib
+    if [[ "$TRAVIS_BRANCH" == "auto" ]] || [[ "$TRAVIS_BRANCH" == "try" ]]; then
+      PR=$(echo "$TRAVIS_COMMIT_MESSAGE" | grep -o "#[0-9]*" | head -1 | sed 's/^#//g')
+      output=$(curl -H "Authorization: token $GITHUB_API_TOKEN" -s "https://api.github.com/repos/rust-lang/rust-clippy/pulls/$PR" | \
+        python -c "import sys, json; print(json.load(sys.stdin)['body'])" | \
+        grep "^changelog: " | \
+        sed "s/changelog: //g")
+      if [[ -z "$output" ]]; then
+        echo "ERROR: PR body must contain 'changelog: ...'"
+        exit 1
+      elif [[ "$output" = "none" ]]; then
+        echo "WARNING: changelog is 'none'"
+      fi
+    fi
   - |
-    if [ -z ${INTEGRATION} ]; then
-      ./ci/base-tests.sh && sleep 5
-    else
+    rm rust-toolchain
+    ./setup-toolchain.sh
+  - |
+    SYSROOT=$(rustc --print sysroot)
+    case "$TRAVIS_OS_NAME" in
+      windows ) export PATH="${SYSROOT}/bin:${PATH}" ;;
+      linux ) export LD_LIBRARY_PATH="${SYSROOT}/lib" ;;
+      osx )
+        # See <https://github.com/nteract/nteract/issues/1523#issuecomment-301623519>
+        sudo mkdir -p /usr/local/lib
+        sudo find "$SYSROOT/lib" -maxdepth 1 -name '*.dylib' -exec ln -s {} /usr/local/lib \;
+        ;;
+    esac
+
+script:
+  - |
+    if [[ -n ${INTEGRATION} ]]; then
       ./ci/integration-tests.sh && sleep 5
+    else
+      ./ci/base-tests.sh && sleep 5
     fi
 
-after_success: |
-  #!/bin/bash
-  if [ $(uname) == Linux ]; then
-    set -ex
-    if [ -z ${INTEGRATION} ]; then
-      ./.github/deploy.sh
-    else
-      echo "Not deploying, because we're in an integration test run"
+after_success:
+  - |
+    if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
+      set -e
+      if [[ -z ${INTEGRATION} ]]; then
+        ./.github/deploy.sh
+      else
+        echo "Not deploying, because we're in an integration test run"
+      fi
+      set +e
     fi
-    set +e
-  fi