From 1dd13ca1b1d979d10c717aa5d426e4edd6b45df1 Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Sun, 24 Mar 2024 10:39:48 +0100
Subject: [PATCH 1/3] miri script: build with stable toolchain
---
src/tools/miri/miri | 2 +-
src/tools/miri/miri.bat | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/tools/miri/miri b/src/tools/miri/miri
index 169f4521f2d..5f71fc94438 100755
--- a/src/tools/miri/miri
+++ b/src/tools/miri/miri
@@ -3,5 +3,5 @@ set -e
# Instead of doing just `cargo run --manifest-path .. $@`, we invoke miri-script binary directly. Invoking `cargo run` goes through
# rustup (that sets it's own environmental variables), which is undesirable.
MIRI_SCRIPT_TARGET_DIR="$(dirname "$0")"/miri-script/target
-cargo build $CARGO_EXTRA_FLAGS -q --target-dir "$MIRI_SCRIPT_TARGET_DIR" --manifest-path "$(dirname "$0")"/miri-script/Cargo.toml
+cargo +stable build $CARGO_EXTRA_FLAGS -q --target-dir "$MIRI_SCRIPT_TARGET_DIR" --manifest-path "$(dirname "$0")"/miri-script/Cargo.toml
"$MIRI_SCRIPT_TARGET_DIR"/debug/miri-script "$@"
diff --git a/src/tools/miri/miri.bat b/src/tools/miri/miri.bat
index 959e54d8844..18baa683f65 100644
--- a/src/tools/miri/miri.bat
+++ b/src/tools/miri/miri.bat
@@ -5,7 +5,7 @@ set MIRI_SCRIPT_TARGET_DIR=%0\..\miri-script\target
:: If any other steps are added, the "|| exit /b" must be appended to early
:: return from the script. If not, it will continue execution.
-cargo build %CARGO_EXTRA_FLAGS% -q --target-dir %MIRI_SCRIPT_TARGET_DIR% --manifest-path %0\..\miri-script\Cargo.toml || exit /b
+cargo +stable build %CARGO_EXTRA_FLAGS% -q --target-dir %MIRI_SCRIPT_TARGET_DIR% --manifest-path %0\..\miri-script\Cargo.toml || exit /b
:: Forwards all arguments to this file to the executable.
:: We invoke the binary directly to avoid going through rustup, which would set some extra
From 04b523ff34402bf641eeefb0475baa291382e869 Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Sun, 24 Mar 2024 14:01:28 +0100
Subject: [PATCH 2/3] CI tweaks and show which stable Rust we are using
---
src/tools/miri/.github/workflows/ci.yml | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/tools/miri/.github/workflows/ci.yml b/src/tools/miri/.github/workflows/ci.yml
index c10c711d61b..2c5868d5b37 100644
--- a/src/tools/miri/.github/workflows/ci.yml
+++ b/src/tools/miri/.github/workflows/ci.yml
@@ -34,6 +34,12 @@ jobs:
steps:
- uses: actions/checkout@v3
+ - name: Show Rust version (stable toolchain)
+ run: |
+ rustup show
+ rustc -Vv
+ cargo -V
+
# Cache the global cargo directory, but NOT the local `target` directory which
# we cannot reuse anyway when the nightly changes (and it grows quite large
# over time).
@@ -57,7 +63,7 @@ jobs:
if: ${{ steps.cache.outputs.cache-hit != 'true' }}
run: cargo install -f rustup-toolchain-install-master
- - name: Install "master" toolchain
+ - name: Install miri toolchain
run: |
if [[ ${{ github.event_name }} == 'schedule' ]]; then
echo "Building against latest rustc git version"
@@ -65,13 +71,13 @@ jobs:
fi
./miri toolchain --host ${{ matrix.host_target }}
- - name: Show Rust version
+ - name: Show Rust version (miri toolchain)
run: |
rustup show
rustc -Vv
cargo -V
- - name: Test
+ - name: Test Miri
run: ./ci/ci.sh
style:
From a12decc07a1d0be4c87056896cddbe104781e441 Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Sun, 24 Mar 2024 14:32:43 +0100
Subject: [PATCH 3/3] desperate hack: hard-code bash path on Windows
---
src/tools/miri/ci/ci.sh | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/src/tools/miri/ci/ci.sh b/src/tools/miri/ci/ci.sh
index 9d2c3f362e6..4fa0ba8d02d 100755
--- a/src/tools/miri/ci/ci.sh
+++ b/src/tools/miri/ci/ci.sh
@@ -13,6 +13,15 @@ function endgroup {
begingroup "Building Miri"
+# Special Windows hacks
+if [ "$HOST_TARGET" = i686-pc-windows-msvc ]; then
+ # The $BASH variable is `/bin/bash` here, but that path does not actually work. There are some
+ # hacks in place somewhere to try to paper over this, but the hacks dont work either (see
+ # <https://github.com/rust-lang/miri/pull/3402>). So we hard-code the correct location for Github
+ # CI instead.
+ BASH="C:/Program Files/Git/usr/bin/bash"
+fi
+
# Determine configuration for installed build
echo "Installing release version of Miri"
export RUSTFLAGS="-D warnings"
@@ -63,7 +72,7 @@ function run_tests {
done
# Check that the benchmarks build and run, but without actually benchmarking.
- HYPERFINE="bash -c" ./miri bench
+ HYPERFINE="'$BASH' -c" ./miri bench
fi
## test-cargo-miri