Auto merge of rust-lang#72384 - mati865:ci-fix, r=pietroalbini

Workaround MSYS2/chocolatey issue again
Dylan-DPC-zz · May 20, 2020 · 8858a43 · 8858a43
2 parents f182c4a + 2d4d0db
commit 8858a43
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/ci/scripts/install-msys2-packages.sh b/src/ci/scripts/install-msys2-packages.sh
@@ -6,8 +6,16 @@ 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
+    # FIXME(mati865): temporary workaround until chocolatey updates their MSYS2
+    base_url='https://ci-mirrors.rust-lang.org/rustc/msys2-repo/msys/x86_64'
+    curl ${base_url}/libzstd-1.4.4-2-x86_64.pkg.tar.xz -o libzstd-1.4.4-2-x86_64.pkg.tar.xz
+    curl ${base_url}/pacman-5.2.1-6-x86_64.pkg.tar.xz -o pacman-5.2.1-6-x86_64.pkg.tar.xz
+    curl ${base_url}/zstd-1.4.4-2-x86_64.pkg.tar.xz -o zstd-1.4.4-2-x86_64.pkg.tar.xz
+    pacman -U --noconfirm libzstd-1.4.4-2-x86_64.pkg.tar.xz pacman-5.2.1-6-x86_64.pkg.tar.xz \
+        zstd-1.4.4-2-x86_64.pkg.tar.xz
+    rm libzstd-1.4.4-2-x86_64.pkg.tar.xz pacman-5.2.1-6-x86_64.pkg.tar.xz \
+        zstd-1.4.4-2-x86_64.pkg.tar.xz
+    pacman -Sy
 
     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,7 +17,7 @@ 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
+    # FIXME(mati865): remove `/NoUpdate` once chocolatey updates MSYS2
     choco install -s . msys2 \
         --params="/InstallDir:$(ciCheckoutPath)/msys2 /NoPath /NoUpdate" -y --no-progress
     rm msys2.nupkg chocolatey-core.extension.nupkg