Commit faefaa0

authored

Rollup merge of #144196 - ChrisDenton:init-mingw, r=mati865

2 parents 72588c8 + db1449a commit faefaa0Copy full SHA for faefaa0

File tree

-5

lines changed

-5

lines changed

Lines changed: 0 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -182,11 +182,6 @@ jobs:`
`182`	`182`	`- name: install MinGW`
`183`	`183`	`run: src/ci/scripts/install-mingw.sh`
`184`	`184`
`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`		`-`
`190`	`185`	`- name: install ninja`
`191`	`186`	`run: src/ci/scripts/install-ninja.sh`
`192`	`187`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -43,4 +43,9 @@ if isWindows && isKnownToBeMingwBuild; then`
`43`	`43`	`curl -o mingw.7z "${MIRRORS_BASE}/${mingw_archive}"`
`44`	`44`	`7z x -y mingw.7z > /dev/null`
`45`	`45`	`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 ' '`
`46`	`51`	`fi`

Comments

(0)