From e19552ba414eee7cb5236bf2a65a8da8a802e8ee Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Wed, 25 Mar 2020 11:44:11 +0100 Subject: [PATCH 1/2] cross-running windows-gnu should now also work --- travis.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/travis.sh b/travis.sh index 8b2453584b..590b94b7f5 100755 --- a/travis.sh +++ b/travis.sh @@ -44,4 +44,6 @@ if [ "$TRAVIS_OS_NAME" == linux ]; then elif [ "$TRAVIS_OS_NAME" == osx ]; then # cross-test 64bit Windows from macOS MIRI_TEST_TARGET=x86_64-pc-windows-msvc run_tests + # cross-test 32bit GNU Windows from macOS + MIRI_TEST_TARGET=i686-pc-windows-gnu run_tests fi From 8ffbca797f8be62ac601cc1162e9605185597a00 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Wed, 25 Mar 2020 12:11:05 +0100 Subject: [PATCH 2/2] bump xargo version --- src/bin/cargo-miri.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/cargo-miri.rs b/src/bin/cargo-miri.rs index 8f26aaf4e9..9ef4996992 100644 --- a/src/bin/cargo-miri.rs +++ b/src/bin/cargo-miri.rs @@ -6,7 +6,7 @@ use std::ops::Not; use std::path::{Path, PathBuf}; use std::process::Command; -const XARGO_MIN_VERSION: (u32, u32, u32) = (0, 3, 19); +const XARGO_MIN_VERSION: (u32, u32, u32) = (0, 3, 20); const CARGO_MIRI_HELP: &str = r#"Interprets bin crates and tests in Miri