Merge pull request #3382 from rust-lang-nursery/rustup

[rust.git] / appveyor.yml

diff --git a/appveyor.yml b/appveyor.yml
index 8ab4a994476efef8eb8655dae385c53a74c90450..18f25e916f3f106b88831bccaac19c024fcc7ad6 100644 (file)
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -6,27 +6,26 @@ environment:
         #- TARGET: i686-pc-windows-msvc
         #- TARGET: x86_64-pc-windows-gnu
         - TARGET: x86_64-pc-windows-msvc
-        
+
 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
-        
+    # Don't build these branches
+    except:
+        # Used by bors
+        - trying.tmp
+        - staging.tmp
+
 install:
     - curl -sSf -o rustup-init.exe https://win.rustup.rs/
     - rustup-init.exe -y --default-host %TARGET% --default-toolchain nightly
     - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin
     - git ls-remote https://github.com/rust-lang/rust.git master | awk '{print $1}' >rustc-hash.txt
     - set /p RUSTC_HASH=<rustc-hash.txt
-    - del rust-toolchain
-    - cargo install rustup-toolchain-install-master || echo "rustup-toolchain-install-master already installed"
-    - rustup-toolchain-install-master %RUSTC_HASH% -f -n master
-    - rustup default master
-    - set PATH=%PATH%;C:\Users\appveyor\.rustup\toolchains\master\bin
+# uncomment once https://github.com/rust-lang/rust/issues/55376 is fixed
+#    - del rust-toolchain
+#    - cargo install rustup-toolchain-install-master || echo "rustup-toolchain-install-master already installed"
+#    - rustup-toolchain-install-master %RUSTC_HASH% -f -n master
+#    - rustup default master
+#    - set PATH=%PATH%;C:\Users\appveyor\.rustup\toolchains\master\bin
     - rustc -V
     - cargo -V