From 1aeecb553a79d7bf425a19f74a8b213be63773cb Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Fri, 8 Nov 2019 14:12:54 +0100 Subject: [PATCH] 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 c8ee04275c8..2106ef36550 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 e9df794b594..bb38510e393 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 -- 2.44.0