From 210ef5af8e766a922982c0de63f49d6138415cbb Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Fri, 1 Oct 2021 18:07:29 -0700 Subject: [PATCH] ci: windows: adjust tar workaround tar does not properly implement the -k feature, so don't use it. It incorrectly reports "file exists" when the expected behavior is to leave the existing file alone. --- ci/azure/windows_msvc_install | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/azure/windows_msvc_install b/ci/azure/windows_msvc_install index a5a531a737..1aff93c387 100644 --- a/ci/azure/windows_msvc_install +++ b/ci/azure/windows_msvc_install @@ -10,7 +10,7 @@ TARBALL="llvm+clang+lld-13.0.0-x86_64-windows-msvc-release-mt.tar.xz" pip install s3cmd 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 +# If the first extraction fails, re-try it once; 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 -xf --overwrite $TARBALL