From acb0a87158a4f7850605f162ae3112f084fa22ff Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Fri, 1 Oct 2021 17:18:32 -0700 Subject: [PATCH] ci: windows: workaround for `tar` symlink behavior --- ci/azure/windows_msvc_install | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/ci/azure/windows_msvc_install b/ci/azure/windows_msvc_install index 3f2762ba47..a5a531a737 100644 --- a/ci/azure/windows_msvc_install +++ b/ci/azure/windows_msvc_install @@ -6,6 +6,11 @@ set -e pacman -Suy --needed --noconfirm pacman -S --needed --noconfirm wget p7zip python3-pip tar xz +TARBALL="llvm+clang+lld-13.0.0-x86_64-windows-msvc-release-mt.tar.xz" + pip install s3cmd -wget -nv "https://ziglang.org/deps/llvm%2bclang%2blld-13.0.0-x86_64-windows-msvc-release-mt.tar.xz" -tar xf llvm+clang+lld-13.0.0-x86_64-windows-msvc-release-mt.tar.xz +wget -nv "https://ziglang.org/deps/$TARBALL" +# If the first extraction fails, re-try it once without overwriting old files; +# this can happen if the tarball contains symlinks that are in the table of contents +# before the files that they point to. +tar xf $TARBALL || tar xfk $TARBALL