Merge #3362

[rust.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 818353e0c1607291d857e587c088db85ba9859de..04027833e7af555006fd246d80e19279e4df587d 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,6 +9,15 @@ os:
 
 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
@@ -56,7 +65,8 @@ 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