From fa67662a44c10c641b2343f70df2e7e9e7af355e Mon Sep 17 00:00:00 2001 From: Chris Denton Date: Wed, 16 Jul 2025 01:57:22 +0000 Subject: [PATCH 1/2] Try --- src/ci/scripts/install-mingw.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/ci/scripts/install-mingw.sh b/src/ci/scripts/install-mingw.sh index ad852071f2950..21f73cd8bb985 100755 --- a/src/ci/scripts/install-mingw.sh +++ b/src/ci/scripts/install-mingw.sh @@ -43,4 +43,8 @@ if isWindows && isKnownToBeMingwBuild; then curl -o mingw.7z "${MIRRORS_BASE}/${mingw_archive}" 7z x -y mingw.7z > /dev/null ciCommandAddPath "$(cygpath -m "$(pwd)/${mingw_dir}/bin")" + + # Workaround for spurious ci failures + # see https://rust-lang.zulipchat.com/#narrow/channel/242791-t-infra/topic/Spurious.20bors.20CI.20failures/near/528915775 + mkdir /c/msys64/home/runneradmin fi From 809243e41f67221f84d8d5e40b75881bc9a880e3 Mon Sep 17 00:00:00 2001 From: Chris Denton Date: Wed, 16 Jul 2025 02:56:43 +0000 Subject: [PATCH 2/2] Update install-mingw.sh --- .github/workflows/ci.yml | 5 +++++ src/ci/scripts/install-mingw.sh | 4 ---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e92afc14c20da..dc8ac539a3a09 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -182,6 +182,11 @@ jobs: - name: install MinGW run: src/ci/scripts/install-mingw.sh + # Workaround for spurious ci failures after mingw install + # see https://rust-lang.zulipchat.com/#narrow/channel/242791-t-infra/topic/Spurious.20bors.20CI.20failures/near/528915775 + - name: ensure home dir exists + run: mkdir -p ~ + - name: install ninja run: src/ci/scripts/install-ninja.sh diff --git a/src/ci/scripts/install-mingw.sh b/src/ci/scripts/install-mingw.sh index 21f73cd8bb985..ad852071f2950 100755 --- a/src/ci/scripts/install-mingw.sh +++ b/src/ci/scripts/install-mingw.sh @@ -43,8 +43,4 @@ if isWindows && isKnownToBeMingwBuild; then curl -o mingw.7z "${MIRRORS_BASE}/${mingw_archive}" 7z x -y mingw.7z > /dev/null ciCommandAddPath "$(cygpath -m "$(pwd)/${mingw_dir}/bin")" - - # Workaround for spurious ci failures - # see https://rust-lang.zulipchat.com/#narrow/channel/242791-t-infra/topic/Spurious.20bors.20CI.20failures/near/528915775 - mkdir /c/msys64/home/runneradmin fi