summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2019-10-17 19:14:50 -0400
committerMarge Bot <ben+marge-bot@smart-cactus.org>2019-10-29 20:31:36 -0400
commita7f423eedf79fb7379bb666b90ae6bf67edf35b6 (patch)
tree6cb2ff145af6baee49631ab98d2af508fb78a781
parent3c0372d6bce9c1d580efdfff148e922a6519db08 (diff)
downloadhaskell-a7f423eedf79fb7379bb666b90ae6bf67edf35b6.tar.gz
gitlab-ci: Use pxz to compress binary distributions
-rw-r--r--.gitlab-ci.yml2
-rwxr-xr-x.gitlab/prepare-system.sh1
2 files changed, 2 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0d938fa396..84665851a3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,7 +2,7 @@ variables:
GIT_SSL_NO_VERIFY: "1"
# Commit of ghc/ci-images repository from which to pull Docker images
- DOCKER_REV: 990c5217d1d0e03aea415f951afbc3b1a89240c6
+ DOCKER_REV: 69abb3614435999fd0895bc8a231b7494063e20c
# Sequential version number capturing the versions of all tools fetched by
# .gitlab/win32-init.sh.
diff --git a/.gitlab/prepare-system.sh b/.gitlab/prepare-system.sh
index fbbb81b260..56dba70065 100755
--- a/.gitlab/prepare-system.sh
+++ b/.gitlab/prepare-system.sh
@@ -23,6 +23,7 @@ BUILD_SPHINX_HTML=$BUILD_SPHINX_HTML
BUILD_SPHINX_PDF=$BUILD_SPHINX_PDF
BeConservative=YES
INTEGER_LIBRARY=$INTEGER_LIBRARY
+XZ_CMD=pxz
EOF
cat <<EOF >> mk/build.mk