diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2019-11-23 09:54:55 -0500 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-12-02 11:56:54 -0500 |
| commit | aec98a79a7cc04c3fa8d0f5dfd6cb462daa4e612 (patch) | |
| tree | aa705ca4ce6fe3b4e74d71208f938da4b19dc3a7 | |
| parent | 37eb94b3b060ef83685127ec10d14a9675cf508a (diff) | |
| download | haskell-aec98a79a7cc04c3fa8d0f5dfd6cb462daa4e612.tar.gz | |
gitlab-ci: pxz is unavailable on CentOS 7
Fall back to xz
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rwxr-xr-x | .gitlab/prepare-system.sh | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3e3fa0b4e5..30252bef84 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -699,6 +699,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 56dba70065..a8eabe2678 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 cat > mk/build.mk <<EOF V=1 @@ -23,7 +24,7 @@ BUILD_SPHINX_HTML=$BUILD_SPHINX_HTML BUILD_SPHINX_PDF=$BUILD_SPHINX_PDF BeConservative=YES INTEGER_LIBRARY=$INTEGER_LIBRARY -XZ_CMD=pxz +XZ_CMD=$XZ EOF cat <<EOF >> mk/build.mk |