nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-05-14 02:49:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Use the new component dependency option of the rust-toolchain file"

Browse Source 
This reverts commit 648caced6e.

Rustup on github actions isn't yet updated
This commit is contained in:
bjorn3 2020-11-27 18:05:05 +01:00
parent de4ce8c05f
commit 5988bbd24a
6 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/bootstrap_rustc.yml vendored
View File

@ -34,7 +34,6 @@ 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
View File

@ -40,7 +40,6 @@ 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
prepare.sh
View File

@ -1,6 +1,7 @@
#!/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"

4
rust-toolchain
View File

@ -1,3 +1 @@
[toolchain] nightly-2020-11-27
channel = "nightly-2020-11-27"
components = ["rust-src", "rustc-dev", "llvm-tools-preview"]

2
scripts/cargo.sh
View File

@ -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" | grep channel | sed "s/channel = \"\(.*\)\"/\1/") TOOLCHAIN=$(cat "$dir/rust-toolchain")
cmd=$1 cmd=$1
shift || true shift || true

2
scripts/rustup.sh
View File

@ -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
sed -i "s/\"nightly-.*\"/\"nightly-${TOOLCHAIN}\"/" rust-toolchain echo "nightly-${TOOLCHAIN}" > rust-toolchain
rustup component add rustfmt || true rustup component add rustfmt || true
echo "=> Uninstalling all old nighlies" echo "=> Uninstalling all old nighlies"