diff options
| author | Matthew Pickering <matthewtpickering@gmail.com> | 2022-03-02 16:09:23 +0000 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2022-03-07 14:06:16 -0500 |
| commit | 7bfae2ee0e9548f489c52c0e3f4688a9ae83b12b (patch) | |
| tree | 24093a707c531e654edc36a448fb261b1296fa8b | |
| parent | 89c14a6ca76d244fe975bc4d9d7378d25b805d74 (diff) | |
| download | haskell-7bfae2ee0e9548f489c52c0e3f4688a9ae83b12b.tar.gz | |
Replace use of BIN_DIST_PREP_TAR_COMP with BIN_DIST_NAME
And adds a check to make sure we are not accidently settings
BIN_DIST_PREP_TAR_COMP when using hadrian.
| -rw-r--r-- | .gitlab-ci.yml | 12 | ||||
| -rwxr-xr-x | .gitlab/ci.sh | 3 |
2 files changed, 8 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ac5699a95f..9bd789143e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -404,7 +404,7 @@ validate-x86_64-linux-deb10-debug: BUILD_SPHINX_PDF: "YES" TEST_TYPE: slowtest TEST_ENV: "x86_64-linux-deb10-debug" - BIN_DIST_PREP_TAR_COMP: "ghc-x86_64-deb10-linux-debug.tar.xz" + BIN_DIST_NAME: "ghc-x86_64-deb10-linux-debug" HADDOCK_HYPERLINKED_SOURCES: "yes" # Numa enabled for this build so at least one build tests the libnuma build. # It could be any job but luckily for deb10-debug, I choose it. @@ -420,7 +420,7 @@ validate-x86_64-linux-deb10-integer-simple: BUILD_FLAVOUR: validate BIGNUM_BACKEND: native TEST_ENV: "x86_64-linux-deb10-integer-simple" - BIN_DIST_PREP_TAR_COMP: "ghc-x86_64-deb10-linux-integer-simple.tar.xz" + BIN_DIST_NAME: "ghc-x86_64-deb10-linux-integer-simple.tar.xz" rules: - if: '$CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/' @@ -458,8 +458,8 @@ validate-x86_64-linux-deb10-dwarf: variables: CONFIGURE_ARGS: "--enable-dwarf-unwind" BUILD_FLAVOUR: validate+debug_info - TEST_ENV: "x86_64-linux-deb10-dwarf" - BIN_DIST_PREP_TAR_COMP: "ghc-x86_64-deb10-linux-dwarf.tar.xz" + TEST_ENV: "x86_64-linux-deb10-dwarf-validate" + BIN_DIST_NAME: "ghc-x86_64-deb10-linux-dwarf" rules: - if: '$CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/' @@ -471,7 +471,7 @@ release-x86_64-linux-deb10-dwarf: CONFIGURE_ARGS: "--enable-dwarf-unwind" BUILD_FLAVOUR: perf+debug_info TEST_ENV: "x86_64-linux-deb10-dwarf-perf" - BIN_DIST_PREP_TAR_COMP: "ghc-x86_64-deb10-linux-dwarf.tar.xz" + BIN_DIST_NAME: "ghc-x86_64-deb10-linux-dwarf" artifacts: when: always expire_in: 1 year @@ -660,7 +660,6 @@ release-x86_64-freebsd: variables: NIX_SYSTEM: x86_64-darwin BUILD_FLAVOUR: "validate" - BIN_DIST_PREP_TAR_COMP: "ghc-x86_64-apple-darwin.tar.xz" MACOSX_DEPLOYMENT_TARGET: "10.10" # Only Sierra and onwards supports clock_gettime. See #12858 ac_cv_func_clock_gettime: "no" @@ -724,7 +723,6 @@ release-x86_64-darwin: BUILD_FLAVOUR: "validate" TEST_TYPE: test MAKE_ARGS: "-Werror" - BIN_DIST_PREP_TAR_COMP: "ghc-arm64-apple-darwin.tar.xz" MACOSX_DEPLOYMENT_TARGET: "11.0" CPUS: 8 LANG: "en_US.UTF-8" diff --git a/.gitlab/ci.sh b/.gitlab/ci.sh index 349a6b722b..7cd667fe0d 100755 --- a/.gitlab/ci.sh +++ b/.gitlab/ci.sh @@ -485,6 +485,9 @@ function build_hadrian() { if [ -z "${BIN_DIST_NAME:-}" ]; then fail "BIN_DIST_NAME not set" fi + if [ -n "${BIN_DIST_PREP_TAR_COMP:-}" ]; then + fail "BIN_DIST_PREP_TAR_COMP must not be set for hadrian (you mean BIN_DIST_NAME)" + fi # N.B. First build Hadrian, unsetting MACOSX_DEPLOYMENT_TARGET which may warn # if the bootstrap libraries were built with a different version expectation. |