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.yml | |
| 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.yml')
| -rw-r--r-- | .gitlab-ci.yml | 9 |
1 files changed, 4 insertions, 5 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" |