diff --git a/src/ci/run.sh b/src/ci/run.sh index b486f0525f40d..924d0ef68ef5d 100755 --- a/src/ci/run.sh +++ b/src/ci/run.sh @@ -73,14 +73,6 @@ RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.codegen-units-std=1" # of our CPU resources. RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set dist.compression-profile=balanced" -# When building for mingw, limit the number of parallel linker jobs during -# the LLVM build, as not to run out of memory. -# This is an attempt to fix the spurious build error tracked by -# https://github.com/rust-lang/rust/issues/108227. -if isKnownToBeMingwBuild; then - RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set llvm.link-jobs=1" -fi - # Only produce xz tarballs on CI. gz tarballs will be generated by the release # process by recompressing the existing xz ones. This decreases the storage # space required for CI artifacts. diff --git a/src/ci/scripts/install-mingw.sh b/src/ci/scripts/install-mingw.sh index ed87628659b41..7f41c50df681b 100755 --- a/src/ci/scripts/install-mingw.sh +++ b/src/ci/scripts/install-mingw.sh @@ -6,8 +6,9 @@ IFS=$'\n\t' source "$(cd "$(dirname "$0")" && pwd)/../shared.sh" -MINGW_ARCHIVE_32="i686-14.1.0-release-posix-dwarf-msvcrt-rt_v12-rev0.7z" -MINGW_ARCHIVE_64="x86_64-14.1.0-release-posix-seh-msvcrt-rt_v12-rev0.7z" +MINGW_ARCHIVE_32="i686-14.2.0-release-posix-dwarf-msvcrt-rt_v12-rev2.7z" +MINGW_ARCHIVE_64="x86_64-14.2.0-release-posix-seh-msvcrt-rt_v12-rev2.7z" +TMP_URL="https://github.com/niXman/mingw-builds-binaries/releases/download/14.2.0-rt_v12-rev2/" if isWindows && isKnownToBeMingwBuild; then case "${CI_JOB_NAME}" in @@ -40,7 +41,7 @@ if isWindows && isKnownToBeMingwBuild; then mingw_dir="mingw${bits}" - curl -o mingw.7z "${MIRRORS_BASE}/${mingw_archive}" + curl -Lo mingw.7z "${TMP_URL}/${mingw_archive}" 7z x -y mingw.7z > /dev/null ciCommandAddPath "$(cygpath -m "$(pwd)/${mingw_dir}/bin")"