[commit: ghc] wip/windows-release-profiling: gitlab-ci: Do full `perf` build when building Windows releases (57805f8)

git at git.haskell.org git at git.haskell.org
Sat Mar 9 07:09:03 UTC 2019


Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/windows-release-profiling
Link       : http://ghc.haskell.org/trac/ghc/changeset/57805f8373a60f9692af34890aca45bd2efa0bc7/ghc

>---------------------------------------------------------------

commit 57805f8373a60f9692af34890aca45bd2efa0bc7
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Fri Mar 8 10:05:45 2019 -0500

    gitlab-ci: Do full `perf` build when building Windows releases


>---------------------------------------------------------------

57805f8373a60f9692af34890aca45bd2efa0bc7
 .gitlab-ci.yml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f1f5550..ee13580 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
 ############################################################



More information about the ghc-commits mailing list