Revert "temporarily ignore cached rustup-toolchain-install-master"

This reverts commit 4872c5cbbe9a4f59c71a9ffde4d5e521c08e8ea0.

diff --git a/.appveyor.yml b/.appveyor.yml
index c8ee04275c83505922c56f2fcf68b33f79f58621..2106ef3655032d0098c783514560ae346eac9f9b 100644 (file)
--- 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 e9df794b594020d5588be6400afcba90dcdf1e3a..bb38510e393400505bb122a7a01ee3ea7eca0a62 100644 (file)
--- 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