Skip to content
Snippets Groups Projects
Commit 8565f808 authored by Ben Gamari's avatar Ben Gamari
Browse files

gitlab-ci: pxz is unavailable on CentOS 7

Fall back to xz
parent 2645505f
No related branches found
No related tags found
No related merge requests found
...@@ -699,6 +699,8 @@ release-x86_64-linux-centos7: ...@@ -699,6 +699,8 @@ release-x86_64-linux-centos7:
BUILD_SPHINX_PDF: "NO" BUILD_SPHINX_PDF: "NO"
TEST_ENV: "x86_64-linux-centos7" TEST_ENV: "x86_64-linux-centos7"
BIN_DIST_PREP_TAR_COMP: "ghc-x86_64-centos7-linux.tar.xz" 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: only:
- tags - tags
cache: cache:
......
...@@ -13,6 +13,7 @@ if [[ -z ${BUILD_SPHINX_HTML:-} ]]; then BUILD_SPHINX_HTML=YES; fi ...@@ -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 ${BUILD_SPHINX_PDF:-} ]]; then BUILD_SPHINX_PDF=YES; fi
if [[ -z ${INTEGER_LIBRARY:-} ]]; then INTEGER_LIBRARY=integer-gmp; fi if [[ -z ${INTEGER_LIBRARY:-} ]]; then INTEGER_LIBRARY=integer-gmp; fi
if [[ -z ${BUILD_FLAVOUR:-} ]]; then BUILD_FLAVOUR=perf; fi if [[ -z ${BUILD_FLAVOUR:-} ]]; then BUILD_FLAVOUR=perf; fi
if [[ -z ${XZ:-} ]]; then XZ=pxz; fi
cat > mk/build.mk <<EOF cat > mk/build.mk <<EOF
V=1 V=1
...@@ -23,7 +24,7 @@ BUILD_SPHINX_HTML=$BUILD_SPHINX_HTML ...@@ -23,7 +24,7 @@ BUILD_SPHINX_HTML=$BUILD_SPHINX_HTML
BUILD_SPHINX_PDF=$BUILD_SPHINX_PDF BUILD_SPHINX_PDF=$BUILD_SPHINX_PDF
BeConservative=YES BeConservative=YES
INTEGER_LIBRARY=$INTEGER_LIBRARY INTEGER_LIBRARY=$INTEGER_LIBRARY
XZ_CMD=pxz XZ_CMD=$XZ
EOF EOF
cat <<EOF >> mk/build.mk cat <<EOF >> mk/build.mk
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment