]> git.lizzy.rs Git - rust.git/commitdiff
rely on improved cargo install
authorRalf Jung <post@ralfj.de>
Fri, 31 Jan 2020 10:38:07 +0000 (11:38 +0100)
committerRalf Jung <post@ralfj.de>
Fri, 31 Jan 2020 10:38:07 +0000 (11:38 +0100)
.appveyor.yml
.travis.yml

index 16fd20c9da616d280a47789e3ed429c044ddd41f..4281fe0180f05f9d46a2cb8ecd8be57bc86b3260 100644 (file)
@@ -30,7 +30,7 @@ install:
     - rustup toolchain uninstall beta
     - rustup update
     # Install "master" toolchain
-    - cargo install rustup-toolchain-install-master & exit 0
+    - 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
index cbb7c69db1cdfc089ab6107905c49962c6f0f36f..3f0ca8a016bd2b4a1e5fc27431304b38d5094877 100644 (file)
@@ -37,7 +37,7 @@ before_script:
 - rustup toolchain uninstall beta
 - rustup update
 # Install "master" toolchain
-- cargo install rustup-toolchain-install-master || echo "rustup-toolchain-install-master already installed"
+- cargo install rustup-toolchain-install-master
 - travis_retry rustup-toolchain-install-master -f -n master $RUSTC_HASH -c rust-src -c rustc-dev
 - rustup default master
 - rustc --version