From c3d65a5990dab3aab580f2fe356d9533371a2863 Mon Sep 17 00:00:00 2001 From: Michael Tautschnig Date: Mon, 3 Mar 2025 17:34:25 +0000 Subject: [PATCH 1/9] Install toolchain with rustup >= 1.28.0 See https://github.com/rust-lang/rustup/blob/master/CHANGELOG.md#1280---2025-03-04 --- scripts/setup/install_rustup.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/setup/install_rustup.sh b/scripts/setup/install_rustup.sh index 69478996a0c8..21cf247a3c3a 100755 --- a/scripts/setup/install_rustup.sh +++ b/scripts/setup/install_rustup.sh @@ -7,3 +7,4 @@ set -eux # Install Rust toolchain curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y \ && source ~/.cargo/env +rustup toolchain install From 1e18b2a7da8f7bd2338642b9c1443ea42ef5a333 Mon Sep 17 00:00:00 2001 From: Michael Tautschnig Date: Mon, 3 Mar 2025 17:41:43 +0000 Subject: [PATCH 2/9] Retrieve toolchain version --- scripts/setup/install_rustup.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/setup/install_rustup.sh b/scripts/setup/install_rustup.sh index 21cf247a3c3a..21648fdc54dc 100755 --- a/scripts/setup/install_rustup.sh +++ b/scripts/setup/install_rustup.sh @@ -7,4 +7,7 @@ set -eux # Install Rust toolchain curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y \ && source ~/.cargo/env -rustup toolchain install +SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" +pushd ${SCRIPT_DIR}/../../ +rustup toolchain install $(grep 'channel = ' rust-toolchain.toml | cut -d '"' -f 2) +popd From ff42100c652c0fb8d1cd0cedd60c347b3586b93f Mon Sep 17 00:00:00 2001 From: Zyad Hassan Date: Mon, 3 Mar 2025 11:44:59 -0800 Subject: [PATCH 3/9] Remove argument to rustup toolchain install --- scripts/setup/install_rustup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/setup/install_rustup.sh b/scripts/setup/install_rustup.sh index 21648fdc54dc..e68bf4907dcc 100755 --- a/scripts/setup/install_rustup.sh +++ b/scripts/setup/install_rustup.sh @@ -9,5 +9,5 @@ curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y \ && source ~/.cargo/env SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" pushd ${SCRIPT_DIR}/../../ -rustup toolchain install $(grep 'channel = ' rust-toolchain.toml | cut -d '"' -f 2) +rustup toolchain install popd From e151363aaa04b42899743bab8d915fe3e00b4cfc Mon Sep 17 00:00:00 2001 From: Zyad Hassan Date: Mon, 3 Mar 2025 11:52:00 -0800 Subject: [PATCH 4/9] Add components --- scripts/setup/install_rustup.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/setup/install_rustup.sh b/scripts/setup/install_rustup.sh index e68bf4907dcc..ca9808426db0 100755 --- a/scripts/setup/install_rustup.sh +++ b/scripts/setup/install_rustup.sh @@ -9,5 +9,7 @@ curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y \ && source ~/.cargo/env SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" pushd ${SCRIPT_DIR}/../../ -rustup toolchain install +toolchain_version=$(grep 'channel = ' rust-toolchain.toml | cut -d '"' -f 2) +toolchain_components=$(grep 'components = ' rust-toolchain.toml | cut -d '=' -f 2- | sed 's/[",]//g' | sed 's/\[//' | sed 's/\]//') +rustup toolchain install $toolchain_version --component $toolchain_components popd From 770e00f8b344ea5e1ff7b6e2e412e9434a3df7fb Mon Sep 17 00:00:00 2001 From: Zyad Hassan Date: Mon, 3 Mar 2025 11:54:13 -0800 Subject: [PATCH 5/9] Use a comma-separated list --- scripts/setup/install_rustup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/setup/install_rustup.sh b/scripts/setup/install_rustup.sh index ca9808426db0..e9947547870e 100755 --- a/scripts/setup/install_rustup.sh +++ b/scripts/setup/install_rustup.sh @@ -10,6 +10,6 @@ curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y \ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" pushd ${SCRIPT_DIR}/../../ toolchain_version=$(grep 'channel = ' rust-toolchain.toml | cut -d '"' -f 2) -toolchain_components=$(grep 'components = ' rust-toolchain.toml | cut -d '=' -f 2- | sed 's/[",]//g' | sed 's/\[//' | sed 's/\]//') +toolchain_components=$(grep 'components = ' rust-toolchain.toml | cut -d '=' -f 2- | sed 's/[" ]//g' | sed 's/\[//' | sed 's/\]//') rustup toolchain install $toolchain_version --component $toolchain_components popd From 5e7971530c44196e1d0602d4687f4f7d894a6504 Mon Sep 17 00:00:00 2001 From: Michael Tautschnig Date: Mon, 3 Mar 2025 20:13:56 +0000 Subject: [PATCH 6/9] Fix deny action --- .github/workflows/deny.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/deny.yml b/.github/workflows/deny.yml index a5db349f8abc..c8beaa33a91d 100644 --- a/.github/workflows/deny.yml +++ b/.github/workflows/deny.yml @@ -20,6 +20,8 @@ jobs: - uses: actions/checkout@v4 with: submodules: recursive + - name: Install rustup + run: ./scripts/setup/install_rustup.sh - uses: EmbarkStudios/cargo-deny-action@v2 with: arguments: --all-features --workspace From 38bee3cd6b1ab1dce48cf609eec93997ecf01133 Mon Sep 17 00:00:00 2001 From: Michael Tautschnig Date: Mon, 3 Mar 2025 20:20:20 +0000 Subject: [PATCH 7/9] DEBUG --- scripts/setup/install_rustup.sh | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/scripts/setup/install_rustup.sh b/scripts/setup/install_rustup.sh index e9947547870e..6de74919a38b 100755 --- a/scripts/setup/install_rustup.sh +++ b/scripts/setup/install_rustup.sh @@ -7,9 +7,12 @@ set -eux # Install Rust toolchain curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y \ && source ~/.cargo/env -SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" -pushd ${SCRIPT_DIR}/../../ -toolchain_version=$(grep 'channel = ' rust-toolchain.toml | cut -d '"' -f 2) -toolchain_components=$(grep 'components = ' rust-toolchain.toml | cut -d '=' -f 2- | sed 's/[" ]//g' | sed 's/\[//' | sed 's/\]//') -rustup toolchain install $toolchain_version --component $toolchain_components -popd +rustup --version +cat rust-toolchain.toml +rustup toolchain install +# SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" +# pushd ${SCRIPT_DIR}/../../ +# toolchain_version=$(grep 'channel = ' rust-toolchain.toml | cut -d '"' -f 2) +# toolchain_components=$(grep 'components = ' rust-toolchain.toml | cut -d '=' -f 2- | sed 's/[" ]//g' | sed 's/\[//' | sed 's/\]//') +# rustup toolchain install $toolchain_version --component $toolchain_components +# popd From 8374e2766bb2e131d26ab788fe19850679dd69e0 Mon Sep 17 00:00:00 2001 From: Michael Tautschnig Date: Mon, 3 Mar 2025 20:25:07 +0000 Subject: [PATCH 8/9] More debug --- scripts/setup/install_rustup.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/setup/install_rustup.sh b/scripts/setup/install_rustup.sh index 6de74919a38b..29dcaf92f35b 100755 --- a/scripts/setup/install_rustup.sh +++ b/scripts/setup/install_rustup.sh @@ -7,6 +7,8 @@ set -eux # Install Rust toolchain curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y \ && source ~/.cargo/env +echo $PATH +which rustup rustup --version cat rust-toolchain.toml rustup toolchain install From 41afcd9ba6b7e1f971a2d5f70853f7b9fe84ba64 Mon Sep 17 00:00:00 2001 From: Michael Tautschnig Date: Mon, 3 Mar 2025 20:31:40 +0000 Subject: [PATCH 9/9] Force use of 1.28.0 --- scripts/setup/install_rustup.sh | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/scripts/setup/install_rustup.sh b/scripts/setup/install_rustup.sh index 29dcaf92f35b..dcc3cd74e866 100755 --- a/scripts/setup/install_rustup.sh +++ b/scripts/setup/install_rustup.sh @@ -5,16 +5,11 @@ set -eux # Install Rust toolchain -curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y \ - && source ~/.cargo/env -echo $PATH -which rustup -rustup --version -cat rust-toolchain.toml +curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y +# Don't use .cargo/env as that won't prepend .cargo/bin to the PATH when it's +# already somewhere in there +export PATH="$HOME/.cargo/bin:$PATH" +SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" +pushd ${SCRIPT_DIR}/../../ rustup toolchain install -# SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" -# pushd ${SCRIPT_DIR}/../../ -# toolchain_version=$(grep 'channel = ' rust-toolchain.toml | cut -d '"' -f 2) -# toolchain_components=$(grep 'components = ' rust-toolchain.toml | cut -d '=' -f 2- | sed 's/[" ]//g' | sed 's/\[//' | sed 's/\]//') -# rustup toolchain install $toolchain_version --component $toolchain_components -# popd +popd