Skip to content

Commit b036573

Browse files
committed
Fix rust version to 1.69
See this issue for problems with the official build rust-lang/rust#112286 Change-Id: I902f061ec3398dc7c2df6fb37f9284f58cf73d7d
1 parent ed1d549 commit b036573

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

buildscripts/infrastructure/build-nodes/scripts/install-rust-cargo.sh

+4-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
1616

1717
# define toolchain version explicitly
1818
# 'stable' is allowed only for main(master) branch
19-
TOOLCHAIN_VERSION="stable"
19+
# https://github.com/rust-lang/rust/issues/112286 for the reason of pinning the version
20+
TOOLCHAIN_VERSION="1.69"
2021

2122
DEFAULT_TOOLCHAIN="${TOOLCHAIN_VERSION}-x86_64-unknown-linux-gnu"
2223
DIR_NAME="rust"
@@ -28,7 +29,7 @@ RUSTUP_HOME="$TARGET_DIR/$DIR_NAME/rustup"
2829
export RUSTUP_HOME
2930

3031
# Increase this to enforce a recreation of the build cache
31-
BUILD_ID=8
32+
BUILD_ID=9
3233

3334
build_package() {
3435
WORK_DIR=$(mktemp -d)
@@ -49,9 +50,9 @@ build_package() {
4950
mirrored_download "rustup-init.sh" "https://sh.rustup.rs"
5051
chmod +x rustup-init.sh
5152
./rustup-init.sh -y --no-modify-path --default-toolchain "$DEFAULT_TOOLCHAIN"
53+
${CARGO_HOME}/bin/rustup update
5254
${CARGO_HOME}/bin/rustup target add x86_64-unknown-linux-musl
5355
${CARGO_HOME}/bin/rustup default $TOOLCHAIN_VERSION
54-
${CARGO_HOME}/bin/rustup update
5556
# saves space
5657
rm -rf "$RUSTUP_HOME/toolchains/$DEFAULT_TOOLCHAIN/share/doc/"
5758
}

0 commit comments

Comments
 (0)