diff options
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 483fd89d45..a64e805cd3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -132,7 +132,6 @@ hadrian-ghc-in-ghci: make V=0 -j$THREADS WERROR=-Werror - | make binary-dist TAR_COMP_OPTS="-1" - mv ghc-*.tar.xz ghc.tar.xz - | # Prepare to push git notes. METRICS_FILE=$(mktemp) @@ -150,7 +149,7 @@ hadrian-ghc-in-ghci: junit: junit.xml expire_in: 2 week paths: - - ghc.tar.xz + - ghc-*.tar.xz - junit.xml ################################# @@ -164,6 +163,7 @@ validate-x86_64-darwin: - x86_64-darwin variables: GHC_VERSION: 8.6.3 + BIN_DIST_PREP_TAR_COMP: "bindistprep/ghc-x86_64-apple-darwin.tar.xz" MACOSX_DEPLOYMENT_TARGET: "10.7" # Only Sierra and onwards supports clock_gettime. See #12858 ac_cv_func_clock_gettime: "no" @@ -225,6 +225,7 @@ validate-x86_64-darwin: allow_failure: true variables: TEST_ENV: "aarch64-linux-deb9" + BIN_DIST_PREP_TAR_COMP: "bindistprep/ghc-aarch64-linux-deb9.tar.xz" cache: key: linux-aarch64-deb9 tags: @@ -256,6 +257,7 @@ nightly-aarch64-linux-deb9: image: "registry.gitlab.haskell.org/ghc/ci-images/i386-linux-deb9:$DOCKER_REV" variables: TEST_ENV: "i386-linux-deb9" + BIN_DIST_PREP_TAR_COMP: "bindistprep/ghc-i386-deb9-linux.tar.xz" cache: key: linux-i386-deb9 @@ -286,6 +288,7 @@ nightly-i386-linux-deb9: image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb9:$DOCKER_REV" variables: TEST_ENV: "x86_64-linux-deb9" + BIN_DIST_PREP_TAR_COMP: "bindistprep/ghc-x86_64-deb9-linux.tar.xz" cache: key: linux-x86_64-deb9 @@ -325,6 +328,7 @@ validate-x86_64-linux-deb9-integer-simple: variables: INTEGER_LIBRARY: integer-simple TEST_ENV: "x86_64-linux-deb9-integer-simple" + BIN_DIST_PREP_TAR_COMP: "bindistprep/ghc-x86_64-deb9-linux-integer-simple.tar.xz" nightly-x86_64-linux-deb9-integer-simple: extends: .build-x86_64-linux-deb9 @@ -357,6 +361,7 @@ release-x86_64-linux-deb8: image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb8:$DOCKER_REV" variables: TEST_ENV: "x86_64-linux-deb8" + BIN_DIST_PREP_TAR_COMP: "bindistprep/ghc-x86_64-deb8-linux.tar.xz" only: - tags cache: @@ -376,6 +381,7 @@ release-x86_64-linux-fedora27: image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-fedora27:$DOCKER_REV" variables: TEST_ENV: "x86_64-linux-fedora27" + BIN_DIST_PREP_TAR_COMP: "bindistprep/ghc-x86_64-fedora27-linux.tar.xz" only: - tags cache: @@ -452,6 +458,7 @@ validate-x86_64-windows: variables: GHC_VERSION: "8.6.2" LANG: "en_US.UTF-8" + BIN_DIST_PREP_TAR_COMP: "bindistprep/ghc-x86_64-mingw32.tar.xz" script: - | set MSYSTEM=MINGW64 @@ -459,9 +466,7 @@ validate-x86_64-windows: bash -c './configure --enable-tarballs-autodownload GHC=`pwd`/toolchain/bin/ghc HAPPY=`pwd`/toolchain/bin/happy ALEX=`pwd`/toolchain/bin/alex' - bash -c "echo include mk/flavours/quick.mk > mk/build.mk" - bash -c "PATH=`pwd`/toolchain/bin:$PATH make -j`mk/detect-cpu-count.sh`" - - | - bash -c "make binary-dist TAR_COMP_OPTS=-1" - mv ghc-*.tar.xz ghc.tar.xz + - bash -c "PATH=`pwd`/toolchain/bin:$PATH make binary-dist TAR_COMP_OPTS=-1" - bash -c 'make V=0 test THREADS=`mk/detect-cpu-count.sh` JUNIT_FILE=../../junit.xml' cache: key: x86_64-windows @@ -472,7 +477,7 @@ validate-x86_64-windows: reports: junit: junit.xml paths: - - ghc.tar.xz + - ghc-*.tar.xz - junit.xml ############################################################ |