Update pacman first

rust-lang · May 18, 2020 · 081daf6 · 081daf6
1 parent 34cce58
commit 081daf6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/ci/scripts/install-msys2-packages.sh b/src/ci/scripts/install-msys2-packages.sh
@@ -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
 

diff --git a/src/ci/scripts/install-msys2.sh b/src/ci/scripts/install-msys2.sh
@@ -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"