Auto merge of #1152 - divergentdave:shim-directory, r=RalfJung

[rust.git] / .appveyor.yml

diff --git a/.appveyor.yml b/.appveyor.yml
index c3d575403cb3ddef70075c371ff99c6dead47bd2..4281fe0180f05f9d46a2cb8ecd8be57bc86b3260 100644 (file)
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -12,6 +12,9 @@ branches:
     - auto
     - try
 
+matrix:
+  fast_finish: true     # set this flag to immediately finish build once one of the jobs fails.
+
 cache:
     - '%USERPROFILE%\.cargo'
     - '%USERPROFILE%\.rustup'
@@ -21,14 +24,16 @@ install:
     - set /p RUSTC_HASH=<rust-version
     # Install Rust
     - curl -sSf --retry 3 -o rustup-init.exe https://win.rustup.rs/
-    - rustup-init.exe -y --default-host %TARGET% --default-toolchain stable
+    - rustup-init.exe -y --default-host %TARGET% --default-toolchain stable --profile minimal
     - set PATH=%USERPROFILE%\.cargo\bin;%PATH%
     - rustup default stable
-    - rustup uninstall beta
+    - rustup toolchain uninstall beta
     - rustup update
     # Install "master" toolchain
-    - cargo install rustup-toolchain-install-master & exit 0
-    - rustup-toolchain-install-master -f -n master %RUSTC_HASH% -c cargo -c rust-src
+    - cargo install rustup-toolchain-install-master
+    # We need to install cargo here as well or else the DLL search path inside `cargo run`
+    # will be for the wrong toolchain. (On Unix, `./miri` takes care of this, but not here.)
+    - rustup-toolchain-install-master -f -n master %RUSTC_HASH% -c rust-src -c rustc-dev -c cargo
     - rustup default master
     - rustc --version
     - cargo --version
@@ -36,7 +41,7 @@ install:
 build_script:
     - set RUSTFLAGS=-C debug-assertions
     # Build and install miri
-    - cargo build --release --all-features --all-targets
+    - cargo build --release --all-features --all-targets --locked
     - cargo install --all-features --force --path . --locked --offline
     # Get ourselves a MIR-full libstd, and use it henceforth
     - cargo miri setup
@@ -46,7 +51,7 @@ test_script:
     - set RUST_TEST_NOCAPTURE=1
     - set RUST_BACKTRACE=1
     # Test miri
-    - cargo test --release --all-features
+    - cargo test --release --all-features --locked
     # Test cargo integration
     - cd test-cargo-miri
     - '"C:\msys64\mingw64\bin\python3.exe" run-test.py'