diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2019-07-26 16:55:54 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@well-typed.com> | 2019-10-06 23:40:00 -0400 |
| commit | e7ce44e262f6b7ecb6cd4190f17bffaef780e011 (patch) | |
| tree | 8dbc175cbc61753d397e5a5b3e5071acfabe6c79 | |
| parent | cfaca3db2506bde7896a3b44c794bd86d2163e37 (diff) | |
| download | haskell-wip/werror-hadrian.tar.gz | |
gitlab-ci: Use validate flavour in hadrian buildswip/werror-hadrian
| -rw-r--r-- | .gitlab-ci.yml | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3acfec24e0..4499b1801b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -187,6 +187,8 @@ lint-release-changelogs: .validate-hadrian: <<: *only-default + variables: + FLAVOUR: "validate" script: - cabal update - git clean -xdf && git submodule foreach git clean -xdf @@ -194,8 +196,8 @@ lint-release-changelogs: - if [[ -d ./cabal-cache ]]; then cp -R ./.cabal-cache ~/.cabal-cache; fi - ./boot - ./configure $CONFIGURE_ARGS - - hadrian/build.cabal.sh -j`mk/detect-cpu-count.sh` --docs=no-sphinx binary-dist - - hadrian/build.cabal.sh -j`mk/detect-cpu-count.sh` --docs=no-sphinx test --summary-junit=./junit.xml + - hadrian/build.cabal.sh --flavour=$FLAVOUR -j`mk/detect-cpu-count.sh` --docs=no-sphinx binary-dist + - hadrian/build.cabal.sh --flavour=$FLAVOUR -j`mk/detect-cpu-count.sh` --docs=no-sphinx test --summary-junit=./junit.xml - mv _build/bindist/ghc*.tar.xz ghc.tar.xz cache: key: hadrian @@ -344,6 +346,7 @@ validate-x86_64-darwin: LANG: "en_US.UTF-8" CONFIGURE_ARGS: --with-intree-gmp TEST_ENV: "x86_64-darwin-hadrian" + FLAVOUR: "validate" before_script: - git clean -xdf && git submodule foreach git clean -xdf - git submodule sync --recursive @@ -357,8 +360,8 @@ validate-x86_64-darwin: - cabal update - ./boot - ./configure $CONFIGURE_ARGS - - hadrian/build.cabal.sh -j`mk/detect-cpu-count.sh` --docs=no-sphinx binary-dist - - hadrian/build.cabal.sh -j`mk/detect-cpu-count.sh` --docs=no-sphinx test --summary-junit=./junit.xml + - hadrian/build.cabal.sh --flavour=$FLAVOUR -j`mk/detect-cpu-count.sh` --docs=no-sphinx binary-dist + - hadrian/build.cabal.sh --flavour=$FLAVOUR -j`mk/detect-cpu-count.sh` --docs=no-sphinx test --summary-junit=./junit.xml - mv _build/bindist/ghc*.tar.xz ghc.tar.xz after_script: - cp -Rf $HOME/.cabal cabal-cache @@ -706,15 +709,16 @@ validate-x86_64-linux-fedora27: stage: full-build variables: GHC_VERSION: "8.6.5" + FLAVOUR: "validate" # due to #16574 this currently fails allow_failure: true script: - | python boot bash -c './configure --enable-tarballs-autodownload GHC=`pwd`/toolchain/bin/ghc HAPPY=`pwd`/toolchain/bin/happy ALEX=`pwd`/toolchain/bin/alex' - - bash -c "PATH=`pwd`/toolchain/bin:$PATH hadrian/build.cabal.sh -j`mk/detect-cpu-count.sh` --flavour=Quick --docs=no-sphinx binary-dist" + - bash -c "PATH=`pwd`/toolchain/bin:$PATH hadrian/build.cabal.sh --flavour=$FLAVOUR -j`mk/detect-cpu-count.sh` --flavour=Quick --docs=no-sphinx binary-dist" - mv _build/bindist/ghc*.tar.xz ghc.tar.xz - - bash -c "PATH=`pwd`/toolchain/bin:$PATH hadrian/build.cabal.sh -j`mk/detect-cpu-count.sh` --flavour=quick test --summary-junit=./junit.xml --skip-perf" + - bash -c "PATH=`pwd`/toolchain/bin:$PATH hadrian/build.cabal.sh --flavour=$FLAVOUR -j`mk/detect-cpu-count.sh` --flavour=quick test --summary-junit=./junit.xml --skip-perf" # skipping perf tests for now since we build a quick-flavoured GHC, # which might result in some broken perf tests? tags: |