From 5aa60571fcbb6d44ca32c3d4b5ca3cd2f69787ac Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Fri, 26 Jul 2019 10:21:31 +0200 Subject: [PATCH 1/2] travis: do not install cargo from master --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7db62bc74bd4..26645c307951 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,7 +35,7 @@ before_script: - export PATH=$HOME/.cargo/bin:$PATH # Install "master" toolchain - 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 cargo -c rust-src +- travis_retry rustup-toolchain-install-master -f -n master $RUSTC_HASH -c rust-src - rustup default master - rustc --version From 65541d9021904feb21a11f0a5b3fb3f7c9320a82 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Thu, 15 Aug 2019 22:30:38 +0200 Subject: [PATCH 2/2] rustup update --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 26645c307951..269dc28ca021 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,6 +33,7 @@ before_script: # Install Rust ("stable" toolchain for better caching, it is just used to build rustup-toolchain-install-master) - curl https://build.travis-ci.org/files/rustup-init.sh -sSf | sh -s -- -y --default-toolchain stable - export PATH=$HOME/.cargo/bin:$PATH +- rustup update # Install "master" toolchain - 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