diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2020-10-14 21:56:34 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2020-10-16 00:15:31 -0400 |
| commit | 1bb0512f319c1361e2c5a7ab3e1c2978d3a95b9b (patch) | |
| tree | 6c20f2c4e5fe160b5be90946c77f36f994cef6e4 | |
| parent | cc536288c32df9c4b9f37020b76348f58a57b3cb (diff) | |
| download | haskell-1bb0512f319c1361e2c5a7ab3e1c2978d3a95b9b.tar.gz | |
mingw: Extract zst toolchain archives
This should have been done when the toolchain was bumped.
| -rw-r--r-- | .gitlab-ci.yml | 4 | ||||
| -rw-r--r-- | configure.ac | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b6e31bf75a..511e7d0f28 100644 --- a/.gitlab-ci.yml +++ b/.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 diff --git a/configure.ac b/configure.ac index 3d0bbac7ed..c7ec5556b0 100644 --- a/configure.ac +++ b/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.]) |