Commit 6764da43 authored by Ben Gamari's avatar Ben Gamari 🐢

gitlab-ci: Explicitly set bindist tarball name

parent 1c1b63d6
...@@ -132,7 +132,6 @@ hadrian-ghc-in-ghci: ...@@ -132,7 +132,6 @@ hadrian-ghc-in-ghci:
make V=0 -j$THREADS WERROR=-Werror make V=0 -j$THREADS WERROR=-Werror
- | - |
make binary-dist TAR_COMP_OPTS="-1" make binary-dist TAR_COMP_OPTS="-1"
mv ghc-*.tar.xz ghc.tar.xz
- | - |
# Prepare to push git notes. # Prepare to push git notes.
METRICS_FILE=$(mktemp) METRICS_FILE=$(mktemp)
...@@ -150,7 +149,7 @@ hadrian-ghc-in-ghci: ...@@ -150,7 +149,7 @@ hadrian-ghc-in-ghci:
junit: junit.xml junit: junit.xml
expire_in: 2 week expire_in: 2 week
paths: paths:
- ghc.tar.xz - ghc-*.tar.xz
- junit.xml - junit.xml
################################# #################################
...@@ -164,6 +163,7 @@ validate-x86_64-darwin: ...@@ -164,6 +163,7 @@ validate-x86_64-darwin:
- x86_64-darwin - x86_64-darwin
variables: variables:
GHC_VERSION: 8.6.3 GHC_VERSION: 8.6.3
BIN_DIST_PREP_TAR_COMP: "bindistprep/ghc-x86_64-apple-darwin.tar.xz"
MACOSX_DEPLOYMENT_TARGET: "10.7" MACOSX_DEPLOYMENT_TARGET: "10.7"
# Only Sierra and onwards supports clock_gettime. See #12858 # Only Sierra and onwards supports clock_gettime. See #12858
ac_cv_func_clock_gettime: "no" ac_cv_func_clock_gettime: "no"
...@@ -225,6 +225,7 @@ validate-x86_64-darwin: ...@@ -225,6 +225,7 @@ validate-x86_64-darwin:
allow_failure: true allow_failure: true
variables: variables:
TEST_ENV: "aarch64-linux-deb9" TEST_ENV: "aarch64-linux-deb9"
BIN_DIST_PREP_TAR_COMP: "bindistprep/ghc-aarch64-linux-deb9.tar.xz"
cache: cache:
key: linux-aarch64-deb9 key: linux-aarch64-deb9
tags: tags:
...@@ -256,6 +257,7 @@ nightly-aarch64-linux-deb9: ...@@ -256,6 +257,7 @@ nightly-aarch64-linux-deb9:
image: "registry.gitlab.haskell.org/ghc/ci-images/i386-linux-deb9:$DOCKER_REV" image: "registry.gitlab.haskell.org/ghc/ci-images/i386-linux-deb9:$DOCKER_REV"
variables: variables:
TEST_ENV: "i386-linux-deb9" TEST_ENV: "i386-linux-deb9"
BIN_DIST_PREP_TAR_COMP: "bindistprep/ghc-i386-deb9-linux.tar.xz"
cache: cache:
key: linux-i386-deb9 key: linux-i386-deb9
...@@ -286,6 +288,7 @@ nightly-i386-linux-deb9: ...@@ -286,6 +288,7 @@ nightly-i386-linux-deb9:
image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb9:$DOCKER_REV" image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb9:$DOCKER_REV"
variables: variables:
TEST_ENV: "x86_64-linux-deb9" TEST_ENV: "x86_64-linux-deb9"
BIN_DIST_PREP_TAR_COMP: "bindistprep/ghc-x86_64-deb9-linux.tar.xz"
cache: cache:
key: linux-x86_64-deb9 key: linux-x86_64-deb9
...@@ -325,6 +328,7 @@ validate-x86_64-linux-deb9-integer-simple: ...@@ -325,6 +328,7 @@ validate-x86_64-linux-deb9-integer-simple:
variables: variables:
INTEGER_LIBRARY: integer-simple INTEGER_LIBRARY: integer-simple
TEST_ENV: "x86_64-linux-deb9-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: nightly-x86_64-linux-deb9-integer-simple:
extends: .build-x86_64-linux-deb9 extends: .build-x86_64-linux-deb9
...@@ -357,6 +361,7 @@ release-x86_64-linux-deb8: ...@@ -357,6 +361,7 @@ release-x86_64-linux-deb8:
image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb8:$DOCKER_REV" image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb8:$DOCKER_REV"
variables: variables:
TEST_ENV: "x86_64-linux-deb8" TEST_ENV: "x86_64-linux-deb8"
BIN_DIST_PREP_TAR_COMP: "bindistprep/ghc-x86_64-deb8-linux.tar.xz"
only: only:
- tags - tags
cache: cache:
...@@ -376,6 +381,7 @@ release-x86_64-linux-fedora27: ...@@ -376,6 +381,7 @@ release-x86_64-linux-fedora27:
image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-fedora27:$DOCKER_REV" image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-fedora27:$DOCKER_REV"
variables: variables:
TEST_ENV: "x86_64-linux-fedora27" TEST_ENV: "x86_64-linux-fedora27"
BIN_DIST_PREP_TAR_COMP: "bindistprep/ghc-x86_64-fedora27-linux.tar.xz"
only: only:
- tags - tags
cache: cache:
...@@ -452,6 +458,7 @@ validate-x86_64-windows: ...@@ -452,6 +458,7 @@ validate-x86_64-windows:
variables: variables:
GHC_VERSION: "8.6.2" GHC_VERSION: "8.6.2"
LANG: "en_US.UTF-8" LANG: "en_US.UTF-8"
BIN_DIST_PREP_TAR_COMP: "bindistprep/ghc-x86_64-mingw32.tar.xz"
script: script:
- | - |
set MSYSTEM=MINGW64 set MSYSTEM=MINGW64
...@@ -459,9 +466,7 @@ validate-x86_64-windows: ...@@ -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 './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 "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 "PATH=`pwd`/toolchain/bin:$PATH make -j`mk/detect-cpu-count.sh`"
- | - bash -c "PATH=`pwd`/toolchain/bin:$PATH make binary-dist TAR_COMP_OPTS=-1"
bash -c "make binary-dist TAR_COMP_OPTS=-1"
mv ghc-*.tar.xz ghc.tar.xz
- bash -c 'make V=0 test THREADS=`mk/detect-cpu-count.sh` JUNIT_FILE=../../junit.xml' - bash -c 'make V=0 test THREADS=`mk/detect-cpu-count.sh` JUNIT_FILE=../../junit.xml'
cache: cache:
key: x86_64-windows key: x86_64-windows
...@@ -472,7 +477,7 @@ validate-x86_64-windows: ...@@ -472,7 +477,7 @@ validate-x86_64-windows:
reports: reports:
junit: junit.xml junit: junit.xml
paths: paths:
- ghc.tar.xz - ghc-*.tar.xz
- junit.xml - junit.xml
############################################################ ############################################################
......
...@@ -384,12 +384,12 @@ GhcRtsWithLibdw=$(strip $(if $(filter $(TargetArch_CPP),i386 x86_64),@UseLibdw@, ...@@ -384,12 +384,12 @@ GhcRtsWithLibdw=$(strip $(if $(filter $(TargetArch_CPP),i386 x86_64),@UseLibdw@,
# #
################################################################################ ################################################################################
BINDIST = NO BINDIST = NO
BIN_DIST_NAME = ghc-$(ProjectVersion) BIN_DIST_NAME = ghc-$(ProjectVersion)
BIN_DIST_PREP_DIR = bindistprep/$(BIN_DIST_NAME) BIN_DIST_PREP_DIR = bindistprep/$(BIN_DIST_NAME)
BIN_DIST_PREP_TAR = bindistprep/$(BIN_DIST_NAME)-$(TARGETPLATFORM).tar BIN_DIST_PREP_TAR = bindistprep/$(BIN_DIST_NAME)-$(TARGETPLATFORM).tar
BIN_DIST_PREP_TAR_COMP = $(BIN_DIST_PREP_TAR).$(TAR_COMP_EXT) BIN_DIST_PREP_TAR_COMP ?= $(BIN_DIST_PREP_TAR).$(TAR_COMP_EXT)
BIN_DIST_TAR_COMP = $(BIN_DIST_NAME)-$(TARGETPLATFORM).tar.$(TAR_COMP_EXT) BIN_DIST_TAR_COMP = $(BIN_DIST_NAME)-$(TARGETPLATFORM).tar.$(TAR_COMP_EXT)
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# Utilities programs: flags # Utilities programs: flags
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment