Use rustup-toolchain-install-master to install Cargo

This commit is contained in:
hyd-dev 2021-06-26 20:43:31 +08:00
parent 1692932966
commit 34217bdc8e
No known key found for this signature in database
GPG Key ID: 74FA7FD5B8DA14B8
2 changed files with 2 additions and 7 deletions

View File

@ -77,18 +77,13 @@ jobs:
rustup-toolchain-install-master \ rustup-toolchain-install-master \
-f \ -f \
-n master "$RUSTC_HASH" \ -n master "$RUSTC_HASH" \
-c cargo \
-c rust-src \ -c rust-src \
-c rustc-dev \ -c rustc-dev \
-c llvm-tools \ -c llvm-tools \
--host ${{ matrix.host_target }} --host ${{ matrix.host_target }}
rustup default master rustup default master
# We need a nightly Cargo to run tests that depend on unstable Cargo features.
- name: Install latest nightly
uses: actions-rs/toolchain@v1
with:
toolchain: nightly
- name: Show Rust version - name: Show Rust version
run: | run: |
rustup show rustup show

View File

@ -39,7 +39,7 @@ fi
# Install and setup new toolchain. # Install and setup new toolchain.
rustup toolchain uninstall miri rustup toolchain uninstall miri
rustup-toolchain-install-master -n miri -c rust-src -c rustc-dev -c llvm-tools -- "$NEW_COMMIT" rustup-toolchain-install-master -n miri -c cargo -c rust-src -c rustc-dev -c llvm-tools -- "$NEW_COMMIT"
rustup override set miri rustup override set miri
# Cleanup. # Cleanup.