diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2019-01-21 15:55:05 -0500 |
|---|---|---|
| committer | Ben Gamari <ben@well-typed.com> | 2019-01-23 14:07:28 -0500 |
| commit | 54a50a6e0c1254579cf22a08bde0f28f9bd9d8ce (patch) | |
| tree | 24681fe224264d6a52d2aaa470aff0395cd2677a /.gitlab-ci.yml | |
| parent | c9fe14cc0a1fb808763c9d1bcd5451443f684cdf (diff) | |
| download | haskell-54a50a6e0c1254579cf22a08bde0f28f9bd9d8ce.tar.gz | |
gitlab-ci: Reenable Hadrian build on Windows
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 162c19ccb6..6354d728e1 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: |