Merge #3362

[rust.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 6d44c7faa93d104c15bf3d702d1e5ca822c49454..04027833e7af555006fd246d80e19279e4df587d 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,9 +5,19 @@ rust: nightly
 os:
   - linux
   - osx
+  - windows
 
 sudo: false
 
+branches:
+  only:
+    # This is where pull requests from "bors r+" are built.
+    - staging
+    # This is where pull requests from "bors try" are built.
+    - trying
+    # Also build pull requests.
+    - master
+
 env:
  global:
    - RUST_BACKTRACE=1
@@ -24,10 +34,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,6 +51,8 @@ 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-lang-nursery/stdsimd
@@ -48,11 +65,16 @@ matrix:
     - env: INTEGRATION=chronotope/chrono
     - env: INTEGRATION=serde-rs/serde
     - env: INTEGRATION=Geal/nom
-    - env: INTEGRATION=hyperium/hyper
+# uncomment once https://github.com/rust-lang/rust/issues/55376 is fixed
+#    - 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:
   - |