aboutsummaryrefslogtreecommitdiff
path: root/ci
diff options
context:
space:
mode:
authorAndrew Kelley <andrew@ziglang.org>2021-10-01 18:07:29 -0700
committerAndrew Kelley <andrew@ziglang.org>2021-10-01 18:07:50 -0700
commit210ef5af8e766a922982c0de63f49d6138415cbb (patch)
tree7a419ef27c858b41df30c866b1e2b16847c70f7a /ci
parentf317acb2cdaaba46c8eaa4b06be6651e3a9fd34e (diff)
downloadzig-210ef5af8e766a922982c0de63f49d6138415cbb.tar.gz
zig-210ef5af8e766a922982c0de63f49d6138415cbb.zip
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.
Diffstat (limited to 'ci')
-rw-r--r--ci/azure/windows_msvc_install8
1 files 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