Auto merge of #72332 - mati865:ci-fix, r=pietroalbini
CI: Workaround MSYS2 issue
This commit is contained in:
commit
d8878868c8
|
@ -6,6 +6,9 @@ IFS=$'\n\t'
|
|||
source "$(cd "$(dirname "$0")" && pwd)/../shared.sh"
|
||||
|
||||
if isWindows; then
|
||||
# FIXME(mati865): hopefully temporary workaround for MSYS2 issue
|
||||
pacman -Sy --noconfirm pacman
|
||||
|
||||
pacman -S --noconfirm --needed base-devel ca-certificates make diffutils tar \
|
||||
binutils
|
||||
|
||||
|
|
|
@ -17,8 +17,9 @@ if isWindows; then
|
|||
msys2.nupkg
|
||||
curl -sSL https://packages.chocolatey.org/chocolatey-core.extension.1.3.5.1.nupkg > \
|
||||
chocolatey-core.extension.nupkg
|
||||
# FIXME(mati865): remove `/NoUpdate` once MSYS2 issue is fixed
|
||||
choco install -s . msys2 \
|
||||
--params="/InstallDir:$(ciCheckoutPath)/msys2 /NoPath" -y --no-progress
|
||||
--params="/InstallDir:$(ciCheckoutPath)/msys2 /NoPath /NoUpdate" -y --no-progress
|
||||
rm msys2.nupkg chocolatey-core.extension.nupkg
|
||||
mkdir -p "$(ciCheckoutPath)/msys2/home/${USERNAME}"
|
||||
ciCommandAddPath "$(ciCheckoutPath)/msys2/usr/bin"
|
||||
|
|
Loading…
Reference in New Issue