From f6f87d9177b6a48af4f956c1f452ebc14eb08428 Mon Sep 17 00:00:00 2001 From: Trevor Gross Date: Tue, 1 Oct 2024 23:37:23 -0400 Subject: [PATCH 1/4] Revert "Use small runner for msvc-ext2 job" This reverts commit ebe4fc4e1269157e018cc127d69c8128d1a56702. --- src/ci/github-actions/jobs.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml index 6379f1ade1ce8..65aefa5d01975 100644 --- a/src/ci/github-actions/jobs.yml +++ b/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 @@ -387,7 +383,7 @@ auto: 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 + <<: *job-windows-8c # 32/64-bit MinGW builds. # From d21f8a0460ac2e84c30abe3f7ba439d76db1e686 Mon Sep 17 00:00:00 2001 From: Trevor Gross Date: Tue, 1 Oct 2024 23:37:28 -0400 Subject: [PATCH 2/4] Revert "Fix bash syntax" This reverts commit 0d94e6bac90a804041cf1847e034001b7517e29a. --- src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh | 2 +- 1 file changed, 1 insertion(+), 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 303a2f26c0f82..d7a37712308b4 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 @@ -71,7 +71,7 @@ esac # 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 +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 From bd9dadff0799fdb639f49a930a3dc2985006af88 Mon Sep 17 00:00:00 2001 From: Trevor Gross Date: Tue, 1 Oct 2024 23:37:30 -0400 Subject: [PATCH 3/4] Revert "Fix checktools.sh non-msvc builds" This reverts commit 2f6307d1cca53c153bddee83f4331fe979c61fe4. --- .../docker/host-x86_64/x86_64-gnu-tools/checktools.sh | 11 ++++------- src/ci/github-actions/jobs.yml | 2 ++ 2 files changed, 6 insertions(+), 7 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 d7a37712308b4..5b4da574efb65 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,10 +69,7 @@ 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" ] - 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 +#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 diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml index 65aefa5d01975..77f64b76758ef 100644 --- a/src/ci/github-actions/jobs.yml +++ b/src/ci/github-actions/jobs.yml @@ -382,6 +382,8 @@ 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 From 343579b674ffa428e5cf6338e2f5f8b25a2c8298 Mon Sep 17 00:00:00 2001 From: Trevor Gross Date: Tue, 1 Oct 2024 23:37:31 -0400 Subject: [PATCH 4/4] Revert "Split x86_64-msvc-ext into two jobs" This reverts commit 7358429c00bb874420866d5f78b7166e79ad9f1f. --- .../host-x86_64/x86_64-gnu-tools/checktools.sh | 12 +++++------- src/ci/github-actions/jobs.yml | 14 -------------- 2 files changed, 5 insertions(+), 21 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 5b4da574efb65..a5a5acc333be9 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 @@ -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,7 +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 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 +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 diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml index 77f64b76758ef..4802e155fc8a4 100644 --- a/src/ci/github-actions/jobs.yml +++ b/src/ci/github-actions/jobs.yml @@ -373,20 +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 - - HOST_TARGET: x86_64-pc-windows-msvc - RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-lld - <<: *job-windows-8c - # 32/64-bit MinGW builds. # # We are using MinGW with POSIX threads since LLVM requires