vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use stable toolchain for building cargo tools

Browse source
This commit is contained in:
Jeremy Soller 2024-05-10 19:58:56 -06:00
parent 679384a85d
commit 37b1e1fcfa
No known key found for this signature in database
GPG key ID: D02FD439211AF56F
2 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
bootstrap.sh
View file

@ -897,7 +897,7 @@ rustInstall() {
fi
# If rustup is not installed we should offer to install it for them
if [ -z "$(which rustup)" ]; then
rustup_options="--default-toolchain nightly"
rustup_options="--default-toolchain stable"
echo "You do not have rustup installed."
if [ "$noninteractive" = true ]; then
rustup="y"
@ -924,8 +924,8 @@ rustInstall() {
if [ -z "$(which rustc)" ]; then
echo "Rust is not installed"
echo "Please either run the script again, accepting rustup install"
echo "or install rustc nightly manually (not recommended) via:"
echo "\#curl -sSf https://static.rust-lang.org/rustup.sh | sh -s -- --channel=nightly"
echo "or install rustc stable manually (not recommended) via:"
echo "\#curl -sSf https://static.rust-lang.org/rustup.sh | sh -s -- --channel=stable"
exit 1
else
echo "Your Rust install looks good!"
@ -999,7 +999,6 @@ if [ "$1" == "-h" ] || [ "$1" == "--help" ]; then
elif [ "$1" == "-u" ]; then
git pull upstream master
git submodule update --recursive --init
rustup update nightly
exit
elif [ "$1" == "-s" ]; then
statusCheck
@ -1034,7 +1033,6 @@ rustInstall "$noninteractive"
if [ "$update" == "true" ]; then
git pull upstream master
git submodule update --recursive --init
rustup update nightly
exit
fi

8
podman/rustinstall.sh
View file

@ -2,7 +2,7 @@
# Install Rust in Podman, after the image has been built
curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain nightly
cargo install --force --version 0.1.1 cargo-config
cargo install --force --version 1.16.0 just
cargo install --force --version 0.26.0 cbindgen
curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain stable
cargo +stable install --force --version 0.1.1 cargo-config
cargo +stable install --force --version 1.16.0 just
cargo +stable install --force --version 0.26.0 cbindgen