From 4cc03c16ada6da657ba41e1620f9d5ea0e55fc9f Mon Sep 17 00:00:00 2001 From: Mark Rousskov Date: Sat, 29 Oct 2022 10:28:52 -0400 Subject: [PATCH 1/2] Bump to 1.67.0 --- src/version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/version b/src/version index b6148bc0a759f..65ee0959841f1 100644 --- a/src/version +++ b/src/version @@ -1 +1 @@ -1.66.0 +1.67.0 From b0db70e203706ce681272785e6c592c208a92670 Mon Sep 17 00:00:00 2001 From: Mark Rousskov Date: Sat, 29 Oct 2022 14:24:44 -0400 Subject: [PATCH 2/2] Drop miri cross-compile check for Windows --- src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh b/src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh index 80a066cac298a..d87384556106d 100755 --- a/src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh +++ b/src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh @@ -27,6 +27,10 @@ python3 "$X_PY" test --stage 2 src/tools/rustfmt python3 "$X_PY" test --stage 2 src/tools/miri # We natively run this script on x86_64-unknown-linux-gnu and x86_64-pc-windows-msvc. # Also cover some other targets (on both of these hosts) via cross-testing. -python3 "$X_PY" test --stage 2 src/tools/miri --target i686-pc-windows-msvc +# +# Currently disabled -- we end up pulling in a cross-compile of LLVM (maybe +# just overly eager sanity checks), but in any case this won't work when +# building LLVM as of this comment. +#python3 "$X_PY" test --stage 2 src/tools/miri --target i686-pc-windows-msvc #FIXME(https://github.com/rust-lang/rust/issues/103519): macOS testing is currently disabled # python3 "$X_PY" test --stage 2 src/tools/miri --target aarch64-apple-darwin