Skip to content

Commit

Permalink
Auto merge of #130072 - ChrisDenton:split-ci, r=<try>
Browse files Browse the repository at this point in the history
Split x86_64-msvc-ext into two jobs

This is an attempt to mitigate (but not resolve) the high failure rate of the x86_64-msvc-ext builder. The theory being that doing less makes it less likely to fail. But this may not work as having an extra job that may fail might be worse.

try-job: x86_64-msvc-ext
try-job: x86_64-msvc-ext2
  • Loading branch information
bors committed Sep 7, 2024
2 parents 9afe713 + 7358429 commit 1cf006f
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 5 deletions.
12 changes: 7 additions & 5 deletions src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,9 @@ 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.
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
#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
;;
*)
echo "FATAL: unexpected host $HOST_TARGET"
Expand All @@ -68,6 +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.
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 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
14 changes: 14 additions & 0 deletions src/ci/github-actions/jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -373,6 +373,20 @@ 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
Expand Down

0 comments on commit 1cf006f

Please sign in to comment.