[Git][ghc/ghc][wip/bump-win32] mingw: Extract zst toolchain archives

[Ben Gamari]

Ben Gamari pushed to branch wip/bump-win32 at Glasgow Haskell Compiler / GHC


Commits:
e319c9fe by Ben Gamari at 2020-10-15T09:18:22-04:00
mingw: Extract zst toolchain archives

This should have been done when the toolchain was bumped.

- - - - -


2 changed files:

- .gitlab-ci.yml
- configure.ac


Changes:

=====================================
.gitlab-ci.yml
=====================================
@@ -5,8 +5,8 @@ variables:
   DOCKER_REV: 6ceb0cecaeefd4927b26c054e4897724986078c8
 
   # Sequential version number capturing the versions of all tools fetched by
-  # .gitlab/ci.sh.
-  WINDOWS_TOOLCHAIN_VERSION: 3
+  # .gitlab/ci.sh. Used for invalidation of GitLab CI cache.
+  WINDOWS_TOOLCHAIN_VERSION: 4
 
   # Disable shallow clones; they break our linting rules
   GIT_DEPTH: 0


=====================================
configure.ac
=====================================
@@ -417,7 +417,8 @@ set_up_tarballs() {
         rm -rf inplace/mingw
         local base_dir="../ghc-tarballs/${tarball_dest_dir}"
         ( cd inplace &&
-        find "${base_dir}" -name "*.tar.xz" -exec tar xfJ {} \; &&
+        find "${base_dir}" -name "*.tar.xz" -exec tar --xz -xf {} \; &&
+        find "${base_dir}" -name "*.tar.zst" -exec tar --zstd -xf {} \; &&
         rm ".MTREE" &&
         rm ".PKGINFO" &&
         cd .. ) || AC_MSG_ERROR([Could not extract Windows toolchains.])



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/e319c9fe09628f9d65fe8a8f4a1341a62123c1fc

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/e319c9fe09628f9d65fe8a8f4a1341a62123c1fc
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20201015/137a73b9/attachment.html>