Skip to content

Commit 081daf6

Browse files
committed
Update pacman first
1 parent 34cce58 commit 081daf6

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

src/ci/scripts/install-msys2-packages.sh

+3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ IFS=$'\n\t'
66
source "$(cd "$(dirname "$0")" && pwd)/../shared.sh"
77

88
if isWindows; then
9+
# FIXME(mati865): hopefully temporary workaround for MSYS2 issue
10+
pacman -Sy --noconfirm pacman
11+
912
pacman -S --noconfirm --needed base-devel ca-certificates make diffutils tar \
1013
binutils
1114

src/ci/scripts/install-msys2.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@ if isWindows; then
1717
msys2.nupkg
1818
curl -sSL https://packages.chocolatey.org/chocolatey-core.extension.1.3.5.1.nupkg > \
1919
chocolatey-core.extension.nupkg
20+
# FIXME(mati865): remove `/NoUpdate` once MSYS2 issue is fixed
2021
choco install -s . msys2 \
21-
--params="/InstallDir:$(ciCheckoutPath)/msys2 /NoPath" -y --no-progress
22+
--params="/InstallDir:$(ciCheckoutPath)/msys2 /NoPath /NoUpdate" -y --no-progress
2223
rm msys2.nupkg chocolatey-core.extension.nupkg
2324
mkdir -p "$(ciCheckoutPath)/msys2/home/${USERNAME}"
2425
ciCommandAddPath "$(ciCheckoutPath)/msys2/usr/bin"

0 commit comments

Comments
 (0)