X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=appveyor.yml;h=c852cd8232e1ef6582780d15c5506f6d38a53320;hb=6feed2713c7740eb5868eba43745bc508b8b77aa;hp=c17b12a33b3814775f9e103ffd628e2629d5b911;hpb=49b00ec440371b39f93ac2247c0dff1cd29c9ef3;p=rust.git

diff --git a/appveyor.yml b/appveyor.yml
index c17b12a33b3..c852cd8232e 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -2,21 +2,29 @@ environment:
     global:
         PROJECT_NAME: rust-clippy
     matrix:
-        - TARGET: i686-pc-windows-gnu
-          MSYS2_BITS: 32
-        - TARGET: i686-pc-windows-msvc
-          MSYS2_BITS: 32
-        - TARGET: x86_64-pc-windows-gnu
-          MSYS2_BITS: 64
+        #- TARGET: i686-pc-windows-gnu
+        #- TARGET: i686-pc-windows-msvc
+        #- TARGET: x86_64-pc-windows-gnu
         - TARGET: x86_64-pc-windows-msvc
-          MSYS2_BITS: 64
+
+branches:
+    # Don't build these branches
+    except:
+        # Used by bors
+        - trying.tmp
+        - staging.tmp
 
 install:
-    - set PATH=C:\Program Files\Git\mingw64\bin;%PATH%
     - 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;C:\Users\appveyor\.rustup\toolchains\nightly-%TARGET%\bin
-    - if defined MSYS2_BITS set PATH=%PATH%;C:\msys64\mingw%MSYS2_BITS%\bin
+    - 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 --debug || 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
 
@@ -26,9 +34,6 @@ test_script:
     - set RUST_BACKTRACE=1
     - cargo build --features debugging
     - cargo test --features debugging
-    - copy target\debug\cargo-clippy.exe C:\Users\appveyor\.cargo\bin\
-    - cargo clippy -- -D clippy
-    - cd clippy_lints && cargo clippy -- -D clippy && cd ..
 
 notifications:
     - provider: Email