diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2019-03-08 10:05:45 -0500 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2019-03-20 23:31:56 -0400 |
| commit | f7b390da51550e0e5020143b9dd2d3701d84b427 (patch) | |
| tree | f606a99c36d0c8a9a8b811c875dded5f0cf37752 | |
| parent | 3423664b80ce3c8f5fa3104f3b0a1bcd0e539a02 (diff) | |
| download | haskell-f7b390da51550e0e5020143b9dd2d3701d84b427.tar.gz | |
gitlab-ci: Do full `perf` build when building Windows releases
| -rw-r--r-- | .gitlab-ci.yml | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 074004734a..f6a5998077 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -471,13 +471,14 @@ nightly-i386-windows-hadrian: # due to #16084 allow_failure: true variables: + BUILD_FLAVOUR: "quick" GHC_VERSION: "8.6.2" BIN_DIST_PREP_TAR_COMP: "bindistprep/ghc-x86_64-mingw32.tar.xz" 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 "echo include mk/flavours/quick.mk > mk/build.mk" + - bash -c "echo include mk/flavours/${BUILD_FLAVOUR}.mk > mk/build.mk" - bash -c "PATH=`pwd`/toolchain/bin:$PATH make -j`mk/detect-cpu-count.sh`" - bash -c "PATH=`pwd`/toolchain/bin:$PATH make binary-dist TAR_COMP_OPTS=-1" - bash -c 'make V=0 test THREADS=`mk/detect-cpu-count.sh` JUNIT_FILE=../../junit.xml' @@ -499,12 +500,22 @@ validate-x86_64-windows: cache: key: x86_64-windows +# Normal Windows validate builds are profiled; that won't do for releases. +release-x86_64-windows: + extends: validate-x86_64-windows + variables: + MSYSTEM: MINGW64 + BUILD_FLAVOUR: "perf" + only: + - tags + release-i386-windows: extends: .build-windows-make only: - tags variables: MSYSTEM: MINGW32 + BUILD_FLAVOUR: "perf" cache: key: i386-windows |