diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2019-11-23 09:54:55 -0500 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2019-12-06 16:51:01 -0500 |
| commit | 61820b248af578389253c25e64a023abba7e4580 (patch) | |
| tree | 2a92aeec73e34c4b1e079aa0f2ee4b6b890d1214 | |
| parent | 599a5916a30224fc74ec38c7e53a9e0874ace893 (diff) | |
| download | haskell-61820b248af578389253c25e64a023abba7e4580.tar.gz | |
gitlab-ci: pxz is unavailable on CentOS 7
Fall back to xz
(cherry picked from commit 8565f808789d5c1c0950ec61c8b6b8d584c37d0a)
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rwxr-xr-x | .gitlab/prepare-system.sh | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b0f578d869..0c80e89293 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -713,6 +713,8 @@ release-x86_64-linux-centos7: BUILD_SPHINX_PDF: "NO" TEST_ENV: "x86_64-linux-centos7" BIN_DIST_PREP_TAR_COMP: "ghc-x86_64-centos7-linux.tar.xz" + # pxz is not available on centos7 for reasons I can't understand + XZ: "xz" only: - tags cache: diff --git a/.gitlab/prepare-system.sh b/.gitlab/prepare-system.sh index 0b7cc9da3c..585f0042d4 100755 --- a/.gitlab/prepare-system.sh +++ b/.gitlab/prepare-system.sh @@ -13,6 +13,7 @@ if [[ -z ${BUILD_SPHINX_HTML:-} ]]; then BUILD_SPHINX_HTML=YES; fi if [[ -z ${BUILD_SPHINX_PDF:-} ]]; then BUILD_SPHINX_PDF=YES; fi if [[ -z ${INTEGER_LIBRARY:-} ]]; then INTEGER_LIBRARY=integer-gmp; fi if [[ -z ${BUILD_FLAVOUR:-} ]]; then BUILD_FLAVOUR=perf; fi +if [[ -z ${XZ:-} ]]; then XZ=pxz; fi if [[ -z ${XZ:-} ]]; then if which pxz; then |