Auto merge of rust-lang#131133 - tgross35:revert-msvc-ci-changes, r=<…

…try>

Revert MSVC CI changes

- rust-lang#130151
- rust-lang#130072

try-job: x86_64-msvc
try-job: x86_64-msvc-ext

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

@@ -58,9 +58,8 @@ case $HOST_TARGET in
     # Strangely, Linux targets do not work here. cargo always says
     # "error: cannot produce cdylib for ... as the target ... does not support these crate types".
     # Only run "pass" tests, which is quite a bit faster.
-    #FIXME: Re-enable this once CI issues are fixed
-    #python3 "$X_PY" test --stage 2 src/tools/miri --target aarch64-apple-darwin --test-args pass
-    #python3 "$X_PY" test --stage 2 src/tools/miri --target i686-pc-windows-gnu --test-args pass
+    python3 "$X_PY" test --stage 2 src/tools/miri --target aarch64-apple-darwin --test-args pass
+    python3 "$X_PY" test --stage 2 src/tools/miri --target i686-pc-windows-gnu --test-args pass
     ;;
   *)
     echo "FATAL: unexpected host $HOST_TARGET"
@@ -69,10 +68,6 @@ 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 for msvc once CI issues are fixed
-if [ "$HOST_TARGET" != "x86_64-pc-windows-msvc" ]; then
-  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
+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

src/ci/github-actions/jobs.yml

@@ -24,10 +24,6 @@ runners:
     os: macos-14
     <<: *base-job
 
-  - &job-windows
-    os: windows-2022
-    <<: *base-job
-
   - &job-windows-8c
     os: windows-2022-8core-32gb
     <<: *base-job
@@ -377,18 +373,6 @@ auto:
       DEPLOY_TOOLSTATES_JSON: toolstates-windows.json
     <<: *job-windows-8c
 
-  # Temporary builder to workaround CI issues
-  - image: x86_64-msvc-ext2
-    env:
-      SCRIPT: >
-        python x.py test --stage 2 src/tools/miri --target aarch64-apple-darwin --test-args pass &&
-        python x.py test --stage 2 src/tools/miri --target i686-pc-windows-gnu --test-args pass &&
-        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
-      RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-lld
-    <<: *job-windows
-
   # 32/64-bit MinGW builds.
   #
   # We are using MinGW with POSIX threads since LLVM requires