diff options
| author | bjorn3 <bjorn3@users.noreply.github.com> | 2020-11-27 18:05:05 +0100 |
|---|---|---|
| committer | bjorn3 <bjorn3@users.noreply.github.com> | 2020-11-27 18:05:05 +0100 |
| commit | 5988bbd24aa87732bfa1d111ba00bcdaa22c481a (patch) | |
| tree | 5925b4bb10cdc79e29f475b04728ba8218fd479a /scripts | |
| parent | de4ce8c05f32fcda7cb42cbecfc1bbf74c72dced (diff) | |
| download | rust-5988bbd24aa87732bfa1d111ba00bcdaa22c481a.tar.gz rust-5988bbd24aa87732bfa1d111ba00bcdaa22c481a.zip | |
Revert "Use the new component dependency option of the rust-toolchain file"
This reverts commit 648caced6eb0d23c31758f69f2f44a7d748526b9. Rustup on github actions isn't yet updated
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/cargo.sh | 2 | ||||
| -rwxr-xr-x | scripts/rustup.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/cargo.sh b/scripts/cargo.sh index 3e47a1cf558..dcd40acc02a 100755 --- a/scripts/cargo.sh +++ b/scripts/cargo.sh @@ -4,7 +4,7 @@ dir=$(dirname "$0") source "$dir/config.sh" # read nightly compiler from rust-toolchain file -TOOLCHAIN=$(cat "$dir/rust-toolchain" | grep channel | sed "s/channel = \"\(.*\)\"/\1/") +TOOLCHAIN=$(cat "$dir/rust-toolchain") cmd=$1 shift || true diff --git a/scripts/rustup.sh b/scripts/rustup.sh index 0f22d0d3845..430f5c469b4 100755 --- a/scripts/rustup.sh +++ b/scripts/rustup.sh @@ -8,7 +8,7 @@ case $1 in echo "=> Installing new nightly" rustup toolchain install --profile minimal "nightly-${TOOLCHAIN}" # Sanity check to see if the nightly exists - sed -i "s/\"nightly-.*\"/\"nightly-${TOOLCHAIN}\"/" rust-toolchain + echo "nightly-${TOOLCHAIN}" > rust-toolchain rustup component add rustfmt || true echo "=> Uninstalling all old nighlies" |