diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2019-12-10 13:12:17 -0500 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-12-16 19:33:01 -0500 |
| commit | cc6280885f15c00703c4fc8305f6d47747910fc2 (patch) | |
| tree | 650eb8b84c7633382f81fdaebd424544d8eed89e /.gitlab-ci.yml | |
| parent | ac25a3f637d894e9b972600e8942a91570e2dcd0 (diff) | |
| download | haskell-cc6280885f15c00703c4fc8305f6d47747910fc2.tar.gz | |
gitlab-ci: Another approach for xz detection
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b1075a06af..e27be0c2f3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -649,8 +649,6 @@ validate-x86_64-linux-deb9-dwarf: variables: TEST_ENV: "x86_64-linux-deb10" BIN_DIST_PREP_TAR_COMP: "./ghc-x86_64-deb10-linux.tar.xz" - # pxz doesn't exist; it's xz --threads - XZ: "xz --threads=$CORES" cache: key: linux-x86_64-deb10 @@ -715,7 +713,6 @@ release-x86_64-linux-deb8: BUILD_SPHINX_PDF: "NO" TEST_ENV: "x86_64-linux-alpine" BIN_DIST_PREP_TAR_COMP: "ghc-x86_64-alpine-linux.tar.xz" - XZ: "xz --threads=$CORES" # Can't use ld.gold due to #13958. CONFIGURE_ARGS: "--disable-ld-override" cache: @@ -748,8 +745,6 @@ nightly-x86_64-linux-alpine: 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" # CentOS seems to default to ascii LANG: "en_US.UTF-8" cache: |