Merge pull request #1543 from Manishearth/fix-windows-tests

[rust.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 96d7915a2e8286a34a7ac150692b80be58d991f1..fa39dd4bed664e020d9323d9eb451ac9b9177558 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,17 @@
 language: rust
+
 rust: nightly
+
+os:
+  - linux
+  - osx
+
 sudo: false
-cache: cargo
+
+cache:
+  cargo: true
+  directories:
+  - clippy_lints/target
 
 env:
  global:
@@ -15,42 +25,36 @@ install:
   - npm install remark-cli remark-lint
 
 script:
- - set -e
+ - PATH=$PATH:./node_modules/.bin
  - remark -f README.md > /dev/null
- - python util/update_lints.py -c
+ - 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
  - PATH=$PATH:~/rust/cargo/bin cargo clippy -- -D clippy
  - cd clippy_lints && PATH=$PATH:~/rust/cargo/bin cargo clippy -- -D clippy && cd ..
+ - set +e
 
-after_success:
-# trigger rebuild of the clippy-service, to keep it up to date with clippy itself
-- |
-    #!/bin/bash
+after_success: |
+  #!/bin/bash
+  if [ $(uname) == Linux ]; then
+    ./.github/deploy.sh
+  # trigger rebuild of the clippy-service, to keep it up to date with clippy itself
     set -e
     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/ligthyear%2Fclippy-service/requests
-
+          -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
-- |
-    if  [ "$TRAVIS_PULL_REQUEST" == "false" ] &&
-        [ "$TRAVIS_REPO_SLUG" == "Manishearth/rust-clippy" ] &&
-        [ "$TRAVIS_BRANCH" == "master" ] ; then
-    
-        python util/export.py
-    
-    fi
+    set +e
+  fi