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

[rust.git] / appveyor.yml

diff --git a/appveyor.yml b/appveyor.yml
index 74b659b0b0fa7a8f0f91a99c7f0520d4925f6c6d..18f25e916f3f106b88831bccaac19c024fcc7ad6 100644 (file)
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -2,22 +2,30 @@ environment:
     global:
         PROJECT_NAME: rust-clippy
     matrix:
-        - TARGET: i686-pc-windows-gnu
-          MSYS2_BITS: 32
-          RUN_CARGO_CLIPPY: true
-        - TARGET: i686-pc-windows-msvc
-          MSYS2_BITS: 32
-          RUN_CARGO_CLIPPY: true
-        - 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:
     - 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
+# 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
 
@@ -27,9 +35,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
-    - if defined RUN_CARGO_CLIPPY cd clippy_lints && cargo clippy -- -D clippy && cd ..
 
 notifications:
     - provider: Email