Skip to content

Commit 343579b

Browse files
committed
Revert "Split x86_64-msvc-ext into two jobs"
This reverts commit 7358429.
1 parent bd9dadf commit 343579b

File tree

2 files changed

+5
-21
lines changed

2 files changed

+5
-21
lines changed

src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh

+5-7
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,8 @@ case $HOST_TARGET in
5858
# Strangely, Linux targets do not work here. cargo always says
5959
# "error: cannot produce cdylib for ... as the target ... does not support these crate types".
6060
# Only run "pass" tests, which is quite a bit faster.
61-
#FIXME: Re-enable this once CI issues are fixed
62-
#python3 "$X_PY" test --stage 2 src/tools/miri --target aarch64-apple-darwin --test-args pass
63-
#python3 "$X_PY" test --stage 2 src/tools/miri --target i686-pc-windows-gnu --test-args pass
61+
python3 "$X_PY" test --stage 2 src/tools/miri --target aarch64-apple-darwin --test-args pass
62+
python3 "$X_PY" test --stage 2 src/tools/miri --target i686-pc-windows-gnu --test-args pass
6463
;;
6564
*)
6665
echo "FATAL: unexpected host $HOST_TARGET"
@@ -69,7 +68,6 @@ case $HOST_TARGET in
6968
esac
7069
# Also smoke-test `x.py miri`. This doesn't run any actual tests (that would take too long),
7170
# but it ensures that the crates build properly when tested with Miri.
72-
#FIXME: Re-enable this once CI issues are fixed
73-
#python3 "$X_PY" miri --stage 2 library/core --test-args notest
74-
#python3 "$X_PY" miri --stage 2 library/alloc --test-args notest
75-
#python3 "$X_PY" miri --stage 2 library/std --test-args notest
71+
python3 "$X_PY" miri --stage 2 library/core --test-args notest
72+
python3 "$X_PY" miri --stage 2 library/alloc --test-args notest
73+
python3 "$X_PY" miri --stage 2 library/std --test-args notest

src/ci/github-actions/jobs.yml

-14
Original file line numberDiff line numberDiff line change
@@ -373,20 +373,6 @@ auto:
373373
DEPLOY_TOOLSTATES_JSON: toolstates-windows.json
374374
<<: *job-windows-8c
375375

376-
# Temporary builder to workaround CI issues
377-
- image: x86_64-msvc-ext2
378-
env:
379-
SCRIPT: >
380-
python x.py test --stage 2 src/tools/miri --target aarch64-apple-darwin --test-args pass &&
381-
python x.py test --stage 2 src/tools/miri --target i686-pc-windows-gnu --test-args pass &&
382-
python x.py miri --stage 2 library/core --test-args notest &&
383-
python x.py miri --stage 2 library/alloc --test-args notest &&
384-
python x.py miri --stage 2 library/std --test-args notest
385-
386-
HOST_TARGET: x86_64-pc-windows-msvc
387-
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-lld
388-
<<: *job-windows-8c
389-
390376
# 32/64-bit MinGW builds.
391377
#
392378
# We are using MinGW with POSIX threads since LLVM requires

0 commit comments

Comments
 (0)