summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2019-03-08 10:05:45 -0500
committerBen Gamari <ben@smart-cactus.org>2019-03-08 10:08:17 -0500
commit57805f8373a60f9692af34890aca45bd2efa0bc7 (patch)
tree6dedf0b2eec744704349c0c1faa8316268ef6275
parent068b7e983f4a0b35f453aa5e609998efd0c3f334 (diff)
downloadhaskell-wip/windows-release-profiling.tar.gz
gitlab-ci: Do full `perf` build when building Windows releaseswip/windows-release-profiling
-rw-r--r--.gitlab-ci.yml11
1 files changed, 10 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f1f5550663..ee13580dea 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -418,6 +418,7 @@ validate-x86_64-windows:
# due to #16084
allow_failure: true
variables:
+ BUILD_FLAVOUR: "quick"
GHC_VERSION: "8.6.2"
LANG: "en_US.UTF-8"
script:
@@ -425,7 +426,7 @@ validate-x86_64-windows:
set MSYSTEM=MINGW64
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 "make binary-dist TAR_COMP_OPTS=-1"
@@ -443,6 +444,14 @@ validate-x86_64-windows:
- ghc.tar.xz
- junit.xml
+# Normal Windows validate builds are profiled; that won't do for releases.
+release-x86_64-windows:
+ extends: validate-x86_64-windows
+ variables:
+ BUILD_FLAVOUR: "perf"
+ only:
+ - tags
+
############################################################
# Cleanup
############################################################