From 1aeecb553a79d7bf425a19f74a8b213be63773cb Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Fri, 8 Nov 2019 14:12:54 +0100 Subject: [PATCH 1/3] Revert "temporarily ignore cached rustup-toolchain-install-master" This reverts commit 4872c5cbbe9a4f59c71a9ffde4d5e521c08e8ea0. --- .appveyor.yml | 2 +- .travis.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index c8ee04275c83..2106ef365503 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -31,7 +31,7 @@ install: - rustup component remove rust-docs & exit 0 - rustup update # Install "master" toolchain - - cargo install rustup-toolchain-install-master -f + - cargo install rustup-toolchain-install-master & exit 0 # 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 diff --git a/.travis.yml b/.travis.yml index e9df794b5940..bb38510e3934 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,7 +38,7 @@ before_script: - rustup component remove rust-docs || echo "rust-docs already gone" - rustup update # Install "master" toolchain -- cargo install rustup-toolchain-install-master -f +- cargo install rustup-toolchain-install-master || echo "rustup-toolchain-install-master already installed" - travis_retry rustup-toolchain-install-master -f -n master $RUSTC_HASH -c rust-src -c rustc-dev - rustup default master - rustc --version From d518c38219b9316d4eae2c817ec4fe3b69d4cc29 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Fri, 8 Nov 2019 14:13:23 +0100 Subject: [PATCH 2/3] rust-docs should be gone from all caches now --- .appveyor.yml | 1 - .travis.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 2106ef365503..b9e112aa0860 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -28,7 +28,6 @@ install: - set PATH=%USERPROFILE%\.cargo\bin;%PATH% - rustup default stable - rustup uninstall beta - - rustup component remove rust-docs & exit 0 - rustup update # Install "master" toolchain - cargo install rustup-toolchain-install-master & exit 0 diff --git a/.travis.yml b/.travis.yml index bb38510e3934..a080ab55b94f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,7 +35,6 @@ before_script: - export PATH=$HOME/.cargo/bin:$PATH - rustup default stable - rustup uninstall beta -- rustup component remove rust-docs || echo "rust-docs already gone" - rustup update # Install "master" toolchain - cargo install rustup-toolchain-install-master || echo "rustup-toolchain-install-master already installed" From 9ca277f2e9cface924a5afa8ccfb9c77747956d0 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Fri, 8 Nov 2019 16:36:57 +0100 Subject: [PATCH 3/3] bump minimal xargo version so that it honors the lockfile --- src/bin/cargo-miri.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/bin/cargo-miri.rs b/src/bin/cargo-miri.rs index b889ce52f386..36545766d101 100644 --- a/src/bin/cargo-miri.rs +++ b/src/bin/cargo-miri.rs @@ -6,6 +6,8 @@ use std::process::Command; use std::ops::Not; +const XARGO_MIN_VERSION: (u32, u32, u32) = (0, 3, 17); + const CARGO_MIRI_HELP: &str = r#"Interprets bin crates and tests in Miri Usage: @@ -258,7 +260,7 @@ fn setup(ask_user: bool) { } // First, we need xargo. - if xargo_version().map_or(true, |v| v < (0, 3, 16)) { + if xargo_version().map_or(true, |v| v < XARGO_MIN_VERSION) { if std::env::var("XARGO").is_ok() { // The user manually gave us a xargo binary; don't do anything automatically. show_error(format!("Your xargo is too old; please upgrade to the latest version"))