diff options
| author | Chris Denton <chris@chrisdenton.dev> | 2024-09-07 14:58:59 +0000 |
|---|---|---|
| committer | Josh Stone <jistone@redhat.com> | 2024-10-11 21:52:57 -0700 |
| commit | f07c6ac2dbd77b9904854acbef5a3217be06b2bf (patch) | |
| tree | b810a363c9e883eaaa452a0db1c596d0b4312dd2 | |
| parent | 195a9d53a1bacfc19c0fec32ece0d89811777bd3 (diff) | |
| download | rust-f07c6ac2dbd77b9904854acbef5a3217be06b2bf.tar.gz rust-f07c6ac2dbd77b9904854acbef5a3217be06b2bf.zip | |
Fix checktools.sh non-msvc builds
(cherry picked from commit 2f6307d1cca53c153bddee83f4331fe979c61fe4)
| -rwxr-xr-x | src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh | 11 | ||||
| -rw-r--r-- | src/ci/github-actions/jobs.yml | 2 |
2 files changed, 7 insertions, 6 deletions
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 5b4da574efb..d7a37712308 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 @@ -69,7 +69,10 @@ case $HOST_TARGET in esac # Also smoke-test `x.py miri`. This doesn't run any actual tests (that would take too long), # but it ensures that the crates build properly when tested with Miri. -#FIXME: Re-enable this once CI issues are fixed -#python3 "$X_PY" miri --stage 2 library/core --test-args notest -#python3 "$X_PY" miri --stage 2 library/alloc --test-args notest -#python3 "$X_PY" miri --stage 2 library/std --test-args notest + +#FIXME: Re-enable this for msvc once CI issues are fixed +if [ "$HOST_TARGET" != "x86_64-pc-windows-msvc" ] + python3 "$X_PY" miri --stage 2 library/core --test-args notest + python3 "$X_PY" miri --stage 2 library/alloc --test-args notest + python3 "$X_PY" miri --stage 2 library/std --test-args notest +fi diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml index 7008d351a15..e237e98b7b7 100644 --- a/src/ci/github-actions/jobs.yml +++ b/src/ci/github-actions/jobs.yml @@ -382,8 +382,6 @@ auto: python x.py miri --stage 2 library/core --test-args notest && python x.py miri --stage 2 library/alloc --test-args notest && python x.py miri --stage 2 library/std --test-args notest - - HOST_TARGET: x86_64-pc-windows-msvc RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-lld <<: *job-windows-8c |