Commit 210ef5af8e

Andrew Kelley <andrew@ziglang.org>
2021-10-02 03:07:29
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.
master
1 parent f317acb
Changed files (1)
ci
azure
windows_msvc_install
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