diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2020-10-19 11:07:48 -0400 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-10-20 00:49:41 -0400 |
| commit | 59b08a5d192e102f66a6d9260cc8466d7428cffe (patch) | |
| tree | 9da36b99fb4e6c4fb2b121ecb3187e38c68bddea /.gitlab/ci.sh | |
| parent | 58a1ca3886b00630937d7f5073b2d7961f8e80ca (diff) | |
| download | haskell-59b08a5d192e102f66a6d9260cc8466d7428cffe.tar.gz | |
gitlab-ci: Rename FLAVOUR -> BUILD_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.
Diffstat (limited to '.gitlab/ci.sh')
| -rwxr-xr-x | .gitlab/ci.sh | 6 |
1 files changed, 3 insertions, 3 deletions
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 \ |