diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2020-10-19 11:07:48 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2020-10-19 11:09:04 -0400 |
| commit | 34f5d0b88e78ee86696b15e23543f03001f0c9ad (patch) | |
| tree | 25331100d42d3814490987bb830c4c6ee11eee54 | |
| parent | d858a3aebee5adc447556b668b65b6e46370d8c0 (diff) | |
| download | haskell-wip/flavour.tar.gz | |
gitlab-ci: Rename FLAVOUR -> BUILD_FLAVOURwip/flavour
Previously the Hadrian jobs used the `FLAVOUR` environment variable to
communicate which flavour `ci.sh` should build whereas `make` used
`BUILD_FLAVOUR`. This caused unnecessary confusion. Consolidate these
two.
| -rw-r--r-- | .gitlab-ci.yml | 9 | ||||
| -rwxr-xr-x | .gitlab/ci.sh | 6 |
2 files changed, 7 insertions, 8 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 477e9ffbeb..796145dc45 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -62,7 +62,6 @@ workflow: .release: &release variables: BUILD_FLAVOUR: "perf" - FLAVOUR: "perf" artifacts: when: always expire_in: 1 year @@ -196,7 +195,7 @@ lint-release-changelogs: .validate-hadrian: variables: - FLAVOUR: "validate" + BUILD_FLAVOUR: "validate" script: - .gitlab/ci.sh setup - .gitlab/ci.sh configure @@ -402,7 +401,7 @@ release-x86_64-freebsd: CABAL_INSTALL_VERSION: 3.0.0.0 BIN_DIST_NAME: "ghc-x86_64-portbld-freebsd" TEST_ENV: "x86_64-freebsd-hadrian" - FLAVOUR: "validate" + BUILD_FLAVOUR: "validate" after_script: - cp -Rf $HOME/.cabal cabal-cache - .gitlab/ci.sh clean @@ -466,7 +465,7 @@ validate-x86_64-darwin: CONFIGURE_ARGS: --with-intree-gmp TEST_ENV: "x86_64-darwin-hadrian" BIN_DIST_NAME: "ghc-x86_64-apple-darwin" - FLAVOUR: "validate" + BUILD_FLAVOUR: "validate" script: - .gitlab/ci.sh setup - .gitlab/ci.sh configure @@ -885,7 +884,7 @@ validate-x86_64-linux-fedora27: extends: .build-windows stage: full-build variables: - FLAVOUR: "validate" + BUILD_FLAVOUR: "validate" # skipping perf tests for now since we build a quick-flavoured GHC, # which might result in some broken perf tests? HADRIAN_ARGS: "--docs=no-sphinx --skip-perf" diff --git a/.gitlab/ci.sh b/.gitlab/ci.sh index 5512b0d226..b1c53ded2d 100755 --- a/.gitlab/ci.sh +++ b/.gitlab/ci.sh @@ -374,8 +374,8 @@ function test_make() { } function build_hadrian() { - if [ -z "$FLAVOUR" ]; then - fail "FLAVOUR not set" + if [ -z "$BUILD_FLAVOUR" ]; then + fail "BUILD_FLAVOUR not set" fi if [ -z "$BIN_DIST_NAME" ]; then fail "BIN_DIST_NAME not set" @@ -435,7 +435,7 @@ function clean() { function run_hadrian() { if [ -z "$BIGNUM_BACKEND" ]; then BIGNUM_BACKEND="gmp"; fi run hadrian/build-cabal \ - --flavour="$FLAVOUR" \ + --flavour="$BUILD_FLAVOUR" \ -j"$cores" \ --broken-test="$BROKEN_TESTS" \ --bignum=$BIGNUM_BACKEND \ |