Use the new component dependency option of the rust-toolchain file
This commit is contained in:
parent
41047de9e2
commit
648caced6e
1
.github/workflows/bootstrap_rustc.yml
vendored
1
.github/workflows/bootstrap_rustc.yml
vendored
|
@ -34,6 +34,7 @@ jobs:
|
||||||
run: |
|
run: |
|
||||||
git config --global user.email "user@example.com"
|
git config --global user.email "user@example.com"
|
||||||
git config --global user.name "User"
|
git config --global user.name "User"
|
||||||
|
rustup self update
|
||||||
./prepare.sh
|
./prepare.sh
|
||||||
|
|
||||||
- name: Test
|
- name: Test
|
||||||
|
|
1
.github/workflows/main.yml
vendored
1
.github/workflows/main.yml
vendored
|
@ -40,6 +40,7 @@ jobs:
|
||||||
run: |
|
run: |
|
||||||
git config --global user.email "user@example.com"
|
git config --global user.email "user@example.com"
|
||||||
git config --global user.name "User"
|
git config --global user.name "User"
|
||||||
|
rustup self update
|
||||||
./prepare.sh
|
./prepare.sh
|
||||||
|
|
||||||
- name: Test
|
- name: Test
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
#!/bin/bash --verbose
|
#!/bin/bash --verbose
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
rustup component add rust-src rustc-dev llvm-tools-preview
|
|
||||||
./build_sysroot/prepare_sysroot_src.sh
|
./build_sysroot/prepare_sysroot_src.sh
|
||||||
cargo install hyperfine || echo "Skipping hyperfine install"
|
cargo install hyperfine || echo "Skipping hyperfine install"
|
||||||
|
|
||||||
|
|
|
@ -1 +1,3 @@
|
||||||
nightly-2020-11-21
|
[toolchain]
|
||||||
|
channel = "nightly-2020-11-21"
|
||||||
|
components = ["rust-src", "rustc-dev", "llvm-tools-preview"]
|
||||||
|
|
|
@ -4,7 +4,7 @@ dir=$(dirname "$0")
|
||||||
source "$dir/config.sh"
|
source "$dir/config.sh"
|
||||||
|
|
||||||
# read nightly compiler from rust-toolchain file
|
# read nightly compiler from rust-toolchain file
|
||||||
TOOLCHAIN=$(cat "$dir/rust-toolchain")
|
TOOLCHAIN=$(cat "$dir/rust-toolchain" | grep channel | sed "s/channel = \"\(.*\)\"/\1/")
|
||||||
|
|
||||||
cmd=$1
|
cmd=$1
|
||||||
shift || true
|
shift || true
|
||||||
|
|
|
@ -8,7 +8,7 @@ case $1 in
|
||||||
|
|
||||||
echo "=> Installing new nightly"
|
echo "=> Installing new nightly"
|
||||||
rustup toolchain install --profile minimal "nightly-${TOOLCHAIN}" # Sanity check to see if the nightly exists
|
rustup toolchain install --profile minimal "nightly-${TOOLCHAIN}" # Sanity check to see if the nightly exists
|
||||||
echo "nightly-${TOOLCHAIN}" > rust-toolchain
|
sed -i "s/\"nightly-.*\"/\"nightly-${TOOLCHAIN}\"/" rust-toolchain
|
||||||
rustup component add rustfmt || true
|
rustup component add rustfmt || true
|
||||||
|
|
||||||
echo "=> Uninstalling all old nighlies"
|
echo "=> Uninstalling all old nighlies"
|
||||||
|
|
Loading…
Reference in a new issue