mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

don't assume a nightly toolchain is installed

Browse Source
This commit is contained in:
Ralf Jung 2019-12-01 15:16:55 +01:00
parent 0a4ec5d34e
commit 9501d044c1
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rustup-toolchain
View File

@ -30,17 +30,17 @@ fi
echo "$NEW_COMMIT" > rust-version echo "$NEW_COMMIT" > rust-version
# Check if we already are at that commit. # Check if we already are at that commit.
CUR_COMMIT=$(rustc +miri --version -v | egrep "^commit-hash: " | cut -d " " -f 2) CUR_COMMIT=$(rustc +miri --version -v 2>/dev/null | egrep "^commit-hash: " | cut -d " " -f 2)
if [[ "$CUR_COMMIT" == "$NEW_COMMIT" ]]; then if [[ "$CUR_COMMIT" == "$NEW_COMMIT" ]]; then
echo "miri toolchain is already at commit $CUR_COMMIT." echo "miri toolchain is already at commit $CUR_COMMIT."
rustup override set miri rustup override set miri
exit 0 exit 0
fi fi
# Cleanup.
cargo +nightly clean # Use nightly cargo as miri toolchain might be broken.
rustup toolchain uninstall miri
# Install and setup new toolchain. # Install and setup new toolchain.
rustup toolchain uninstall miri
rustup-toolchain-install-master -n miri -c rust-src -c rustc-dev -- "$NEW_COMMIT" rustup-toolchain-install-master -n miri -c rust-src -c rustc-dev -- "$NEW_COMMIT"
rustup override set miri rustup override set miri
# Cleanup.
cargo clean