Skip to content

Commit a793976

Browse files
authored
Rollup merge of #144196 - ChrisDenton:init-mingw, r=mati865
Initialize mingw for the runner's user This is apparently the more proper fix to https://rust-lang.zulipchat.com/#narrow/channel/242791-t-infra/topic/Spurious.20bors.20CI.20failures/near/528915775 But let's see if it works.
2 parents 5d750c3 + db1449a commit a793976

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -182,11 +182,6 @@ jobs:
182182
- name: install MinGW
183183
run: src/ci/scripts/install-mingw.sh
184184

185-
# Workaround for spurious ci failures after mingw install
186-
# see https://rust-lang.zulipchat.com/#narrow/channel/242791-t-infra/topic/Spurious.20bors.20CI.20failures/near/528915775
187-
- name: ensure home dir exists
188-
run: mkdir -p ~
189-
190185
- name: install ninja
191186
run: src/ci/scripts/install-ninja.sh
192187

src/ci/scripts/install-mingw.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,9 @@ if isWindows && isKnownToBeMingwBuild; then
4343
curl -o mingw.7z "${MIRRORS_BASE}/${mingw_archive}"
4444
7z x -y mingw.7z > /dev/null
4545
ciCommandAddPath "$(cygpath -m "$(pwd)/${mingw_dir}/bin")"
46+
47+
# Initialize mingw for the user.
48+
# This should be done by github but isn't for some reason.
49+
# (see https://github.com/actions/runner-images/issues/12600)
50+
/c/msys64/usr/bin/bash -lc ' '
4651
fi

0 commit comments

Comments
 (0)