Merge pull request #3439 from dtolnay/npbv

[rust.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 6d44c7faa93d104c15bf3d702d1e5ca822c49454..8730535d629ee26f309ecd5ff076e726e6915c75 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,8 +5,14 @@ rust: nightly
 os:
   - linux
   - osx
+  - windows
 
-sudo: false
+branches:
+  # Don't build these branches
+  except:
+    # Used by bors
+    - trying.tmp
+    - staging.tmp
 
 env:
  global:
@@ -24,10 +30,15 @@ before_install:
 install:
   - |
     if [ -z ${INTEGRATION} ]; then
-      . $HOME/.nvm/nvm.sh
-      nvm install stable
-      nvm use stable
-      npm install remark-cli remark-lint
+      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
+      fi
     fi
 
 matrix:
@@ -36,28 +47,34 @@ matrix:
       env: BASE_TESTS=true
     - os: linux
       env: BASE_TESTS=true
+    - os: windows
+      env: BASE_TEST=true
     - env: INTEGRATION=rust-lang/cargo
-    - env: INTEGRATION=rust-lang-nursery/rand
+    - env: INTEGRATION=rust-random/rand
     - env: INTEGRATION=rust-lang-nursery/stdsimd
-    - env: INTEGRATION=rust-lang-nursery/rustfmt
+    - env: INTEGRATION=rust-lang/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=rust-lang/rls
     - env: INTEGRATION=chronotope/chrono
     - env: INTEGRATION=serde-rs/serde
     - env: INTEGRATION=Geal/nom
     - env: INTEGRATION=hyperium/hyper
+  allow_failures:
+  - os: windows
+    env: BASE_TEST=true
 # prevent these jobs with default env vars
   exclude:
     - os: linux
     - os: osx
+    - os: windows
 
 script:
   - |
       rm rust-toolchain
-      cargo install rustup-toolchain-install-master || echo "rustup-toolchain-install-master already installed"
+      cargo install rustup-toolchain-install-master --debug || 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