diff options
| author | Jubilee <workingjubilee@gmail.com> | 2025-03-04 14:50:42 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-04 14:50:42 -0800 |
| commit | 7ba7cc835ec18876b8133c4f051abfd5bfebb0aa (patch) | |
| tree | bf500cc125b18d9f6f7657c2ae512a3edaa9118f /src/ci/docker/scripts | |
| parent | dcc85e3e1a47f2c92d5259ffd1ce4b4c2875fbb6 (diff) | |
| parent | 4f4cbff170684515b47ce1d54ba36dd80ce9c511 (diff) | |
| download | rust-7ba7cc835ec18876b8133c4f051abfd5bfebb0aa.tar.gz rust-7ba7cc835ec18876b8133c4f051abfd5bfebb0aa.zip | |
Rollup merge of #137947 - Kobzol:fix-rfl, r=marcoieni
Do not install rustup on Rust for Linux job Trying to fix the RfL job after the recent rustup update. r? ``@ghost`` try-job: x86_64-rust-for-linux
Diffstat (limited to 'src/ci/docker/scripts')
| -rwxr-xr-x | src/ci/docker/scripts/rfl-build.sh | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/ci/docker/scripts/rfl-build.sh b/src/ci/docker/scripts/rfl-build.sh index 573821c3e59..ea8066d95e0 100755 --- a/src/ci/docker/scripts/rfl-build.sh +++ b/src/ci/docker/scripts/rfl-build.sh @@ -8,16 +8,10 @@ LINUX_VERSION=v6.14-rc3 ../x.py build --stage 2 library rustdoc clippy rustfmt ../x.py build --stage 0 cargo -# Install rustup so that we can use the built toolchain easily, and also -# install bindgen in an easy way. -curl --proto '=https' --tlsv1.2 -sSf -o rustup.sh https://sh.rustup.rs -sh rustup.sh -y --default-toolchain none +BUILD_DIR=$(realpath ./build/x86_64-unknown-linux-gnu) -source /cargo/env - -BUILD_DIR=$(realpath ./build) -rustup toolchain link local "${BUILD_DIR}"/x86_64-unknown-linux-gnu/stage2 -rustup default local +# Provide path to rustc, rustdoc, clippy-driver and rustfmt to RfL +export PATH=${PATH}:${BUILD_DIR}/stage2/bin mkdir -p rfl cd rfl @@ -33,10 +27,14 @@ git -C linux fetch --depth 1 origin ${LINUX_VERSION} git -C linux checkout FETCH_HEAD # Install bindgen -"${BUILD_DIR}"/x86_64-unknown-linux-gnu/stage0/bin/cargo install \ +"${BUILD_DIR}"/stage0/bin/cargo install \ --version $(linux/scripts/min-tool-version.sh bindgen) \ + --root ${BUILD_DIR}/bindgen \ bindgen-cli +# Provide path to bindgen to RfL +export PATH=${PATH}:${BUILD_DIR}/bindgen/bin + # Configure Rust for Linux cat <<EOF > linux/kernel/configs/rfl-for-rust-ci.config # CONFIG_WERROR is not set |