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

[rust.git] / appveyor.yml

diff --git a/appveyor.yml b/appveyor.yml
index 94f9500ab85f253205072422bd11d578b5b364fc..18f25e916f3f106b88831bccaac19c024fcc7ad6 100644 (file)
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -7,16 +7,25 @@ environment:
         #- TARGET: x86_64-pc-windows-gnu
         - TARGET: x86_64-pc-windows-msvc
 
+branches:
+    # 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
-    # https://support.microsoft.com/en-us/help/2524009/error-running-command-shell-scripts-that-include-parentheses
-    - if defined GITHUB_TOKEN del rust-toolchain
-    - if defined GITHUB_TOKEN (cargo install rustup-toolchain-install-master || echo "rustup-toolchain-install-master already installed")
-    - if defined GITHUB_TOKEN rustup-toolchain-install-master -f -n master --github-token %GITHUB_TOKEN%
-    - if defined GITHUB_TOKEN rustup default master
-    - if defined GITHUB_TOKEN set PATH=%PATH%;C:\Users\appveyor\.rustup\toolchains\master\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
+# 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