From 55cfef28c503b43d072b0d591cd7212c1203f8ac Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Tue, 11 Feb 2025 21:58:48 +0100 Subject: [PATCH] set env var to trump portable-simd/rust-toolchain file --- ci-test.sh | 3 +++ rust-version | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ci-test.sh b/ci-test.sh index ec44e45..83497c1 100644 --- a/ci-test.sh +++ b/ci-test.sh @@ -3,6 +3,9 @@ set -euo pipefail DEFAULTFLAGS="-Zrandomize-layout -Zmiri-strict-provenance" +# make sure we keep using the current toolchain even in subdirs that have a toolchain file +export RUSTUP_TOOLCHAIN=$(rustup show active-toolchain | cut -f 1 -d' ') + # apply our patch rm -rf rust-src-patched cp -a $(rustc --print sysroot)/lib/rustlib/src/rust/ rust-src-patched diff --git a/rust-version b/rust-version index 4994bc5..6e6b47d 100644 --- a/rust-version +++ b/rust-version @@ -1 +1 @@ -nightly-2025-02-01 +nightly-2025-02-11