From 765aee877f3399373c3334f03ff44e94aaf26c62 Mon Sep 17 00:00:00 2001 From: Trevor Gross Date: Tue, 10 Dec 2024 23:22:08 +0000 Subject: [PATCH 1/6] Revert "CI: split x86_64-msvc-ext job" This reverts commit e8796c452dcb682c485c1d0e2bfe6298623f7f51. --- src/ci/github-actions/jobs.yml | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml index 959a9580e6003..b7fd005d86f8d 100644 --- a/src/ci/github-actions/jobs.yml +++ b/src/ci/github-actions/jobs.yml @@ -432,12 +432,13 @@ auto: SCRIPT: make ci-msvc <<: *job-windows-8c - # x86_64-msvc-ext is split into multiple jobs to run tests in parallel. - - image: x86_64-msvc-ext1 + - image: x86_64-msvc-ext env: - SCRIPT: python x.py --stage 2 test src/tools/cargotest src/tools/cargo - RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-lld - <<: *job-windows + SCRIPT: python x.py --stage 2 test src/tools/cargotest src/tools/cargo && src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh x.py /tmp/toolstate/toolstates.json windows + HOST_TARGET: x86_64-pc-windows-msvc + RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-lld --save-toolstates=/tmp/toolstate/toolstates.json + DEPLOY_TOOLSTATES_JSON: toolstates-windows.json + <<: *job-windows-8c # Temporary builder to workaround CI issues # See @@ -453,15 +454,6 @@ auto: RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-lld <<: *job-windows - # Run `checktools.sh` and upload the toolstate file. - - image: x86_64-msvc-ext3 - env: - SCRIPT: src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh x.py /tmp/toolstate/toolstates.json windows - HOST_TARGET: x86_64-pc-windows-msvc - RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-lld --save-toolstates=/tmp/toolstate/toolstates.json - DEPLOY_TOOLSTATES_JSON: toolstates-windows.json - <<: *job-windows - # 32/64-bit MinGW builds. # # We are using MinGW with POSIX threads since LLVM requires From dcb31546e3eb4482d31a72f62de78e9278c31b07 Mon Sep 17 00:00:00 2001 From: Trevor Gross Date: Tue, 10 Dec 2024 23:22:20 +0000 Subject: [PATCH 2/6] 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 b7fd005d86f8d..6f9cdaeeaff31 100644 --- a/src/ci/github-actions/jobs.yml +++ b/src/ci/github-actions/jobs.yml @@ -31,10 +31,6 @@ runners: os: macos-14 <<: *base-job - - &job-windows - os: windows-2022 - <<: *base-job - - &job-windows-8c os: windows-2022-8core-32gb <<: *base-job @@ -452,7 +448,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 cc7f26b98a989e565bfaf3e6b6927ff80d859619 Mon Sep 17 00:00:00 2001 From: Trevor Gross Date: Tue, 10 Dec 2024 23:22:25 +0000 Subject: [PATCH 3/6] 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 8324d1ec58624..091a855908783 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 @@ -73,7 +73,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 5c99c4e7aac53bcab9171756c20b61c12f64661d Mon Sep 17 00:00:00 2001 From: Trevor Gross Date: Tue, 10 Dec 2024 23:22:31 +0000 Subject: [PATCH 4/6] 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 091a855908783..0ecc84b6be618 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,10 +71,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 6f9cdaeeaff31..1dc2af41cdccb 100644 --- a/src/ci/github-actions/jobs.yml +++ b/src/ci/github-actions/jobs.yml @@ -447,6 +447,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 a5ddcbecd1457f9655864d853ffc39bace203384 Mon Sep 17 00:00:00 2001 From: Trevor Gross Date: Tue, 10 Dec 2024 23:23:31 +0000 Subject: [PATCH 5/6] Revert "Split x86_64-msvc-ext into two jobs" This reverts commit 7358429c00bb874420866d5f78b7166e79ad9f1f. --- .../host-x86_64/x86_64-gnu-tools/checktools.sh | 14 +++++--------- src/ci/github-actions/jobs.yml | 16 ---------------- 2 files changed, 5 insertions(+), 25 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 0ecc84b6be618..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,11 +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 - # See - # For now, these tests are moved to `x86_64-msvc-ext2` in `src/ci/github-actions/jobs.yml`. - #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" @@ -71,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 1dc2af41cdccb..9d70fd853a265 100644 --- a/src/ci/github-actions/jobs.yml +++ b/src/ci/github-actions/jobs.yml @@ -436,22 +436,6 @@ auto: DEPLOY_TOOLSTATES_JSON: toolstates-windows.json <<: *job-windows-8c - # Temporary builder to workaround CI issues - # See - #FIXME: Remove this, and re-enable the same tests in `checktools.sh`, once CI issues are fixed. - - 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 From d328ccf2777e5499394a1d4918a8e022fa1a6486 Mon Sep 17 00:00:00 2001 From: Trevor Gross Date: Tue, 10 Dec 2024 23:25:32 +0000 Subject: [PATCH 6/6] Add back job-windows so the matrix calculation succeeds --- src/ci/github-actions/jobs.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml index 9d70fd853a265..be153b08db0e9 100644 --- a/src/ci/github-actions/jobs.yml +++ b/src/ci/github-actions/jobs.yml @@ -31,6 +31,10 @@ runners: os: macos-14 <<: *base-job + - &job-windows + os: windows-2022 + <<: *base-job + - &job-windows-8c os: windows-2022-8core-32gb <<: *base-job