[commit: ghc] wip/enable-windows-hadrian-ci: gitlab-ci: Reenable Hadrian build on Windows (5d492be)

git at git.haskell.org git at git.haskell.org
Sun Mar 31 15:09:48 UTC 2019


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

On branch  : wip/enable-windows-hadrian-ci
Link       : http://ghc.haskell.org/trac/ghc/changeset/5d492beb3a510aeff6a332a9a08782de90947f86/ghc

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

commit 5d492beb3a510aeff6a332a9a08782de90947f86
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Mon Jan 21 15:55:05 2019 -0500

    gitlab-ci: Reenable Hadrian build on Windows


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

5d492beb3a510aeff6a332a9a08782de90947f86
 .gitlab-ci.yml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 162c19c..6354d72 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -327,8 +327,6 @@ validate-x86_64-linux-deb9-unreg:
 validate-x86_64-windows-hadrian:
   extends: .validate-windows
   stage: full-build
-  # due to #16073
-  allow_failure: true
   variables:
     GHC_VERSION: "8.6.2"
     LANG: "en_US.UTF-8"
@@ -339,10 +337,11 @@ validate-x86_64-windows-hadrian:
       bash -c './configure --enable-tarballs-autodownload GHC=`pwd`/toolchain/bin/ghc HAPPY=`pwd`/toolchain/bin/happy ALEX=`pwd`/toolchain/bin/alex'
       mkdir -p _build
       cp -R inplace/mingw _build/mingw
-    # FIXME: --no-lint due to #15950
-    - bash -c "PATH=`pwd`/toolchain/bin:$PATH hadrian/build.cabal.sh -j`mk/detect-cpu-count.sh` --flavour=Quick --no-lint"
-    - bash -c "PATH=`pwd`/toolchain/bin:$PATH hadrian/build.cabal.sh binary-dist"
-    - bash -c 'make V=0 test THREADS=`mk/detect-cpu-count.sh` JUNIT_FILE=../../junit.xml'
+    - bash -c "PATH=`pwd`/toolchain/bin:$PATH hadrian/build.cabal.sh -j`mk/detect-cpu-count.sh` --flavour=Quick"
+    # FIXME: Bindist disabled due to #16073
+    #- bash -c "PATH=`pwd`/toolchain/bin:$PATH hadrian/build.cabal.sh binary-dist"
+    # FIXME: Testsuite disabled due to #16156.
+    #- bash -c 'make V=0 test THREADS=`mk/detect-cpu-count.sh` JUNIT_FILE=../../junit.xml'
   cache:
     key: x86_64-windows
   tags:



More information about the ghc-commits mailing list