diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2018-12-19 12:47:43 -0500 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2018-12-21 16:54:40 -0500 |
| commit | 6c5050874762c2f8da44b3bafd67f236832b2030 (patch) | |
| tree | efcf46d08c89a323b958ba920f8d57c2e684fdcb /.gitlab-ci.yml | |
| parent | b1e029a9548090f4fa3e2a6a93814822b928561f (diff) | |
| download | haskell-6c5050874762c2f8da44b3bafd67f236832b2030.tar.gz | |
gitlab-ci: Fix Windows build
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 38 |
1 files changed, 20 insertions, 18 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5266d37c2a..897047e0f0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -253,15 +253,28 @@ validate-x86_64-linux-deb9-unreg: # Validation via Pipelines (Windows) ############################################################ +.validate-windows: + before_script: + - PATH=C:\msys64\usr\bin;%PATH% + - python .gitlab/fix-submodules.py + - git submodule sync --recursive + - git submodule update --init --recursive + - git checkout .gitmodules + - bash .gitlab/win32-init.sh + cache: + paths: + - cabal-cache + - ghc-8.6.2 + - ghc-tarballs + validate-x86_64-windows-hadrian: + extends: .validate-windows stage: full-build variables: GHC_VERSION: "8.6.2" # due to #16073 allow_failure: true script: - - PATH=C:\msys64\usr\bin;%PATH% - - bash .gitlab/win32-init.sh - | set MSYSTEM=MINGW64 python boot @@ -271,39 +284,28 @@ validate-x86_64-windows-hadrian: # 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" - - mv ghc-*.tar.xz ghc.tar.xz - - bash -c 'make V=0 -j`mk/detect-cpu-count.sh` HADDOCK_DOCS=NO test THREADS=$THREADS JUNIT_FILE=../../junit.xml' + - bash -c 'make V=0 test THREADS=$THREADS JUNIT_FILE=../../junit.xml' - cp -Rf $APPDATA/cabal cabal-cache cache: - key: windows-hadrian - paths: - - cabal-cache - - ghc-8.6.2 - - ghc-tarballs + key: x86_64-windows tags: - x86_64-windows validate-x86_64-windows: + extends: .validate-windows stage: full-build variables: GHC_VERSION: "8.6.2" script: - - PATH=C:\msys64\usr\bin;%PATH% - - bash .gitlab/win32-init.sh - | set MSYSTEM=MINGW64 python boot bash -c './configure --with-ghc=`pwd`/toolchain/bin/ghc --enable-tarballs-autodownload HappyCmd=`pwd`/toolchain/bin/happy AlexCmd=`pwd`/toolchain/bin/alex' - bash -c "PATH=`pwd`/toolchain/bin:$PATH make -j`mk/detect-cpu-count.sh`" - - mv ghc-*.tar.xz ghc.tar.xz - - bash -c 'make V=0 -j`mk/detect-cpu-count.sh` HADDOCK_DOCS=NO test THREADS=$THREADS JUNIT_FILE=../../junit.xml' + - bash -c 'make V=0 test THREADS=$THREADS JUNIT_FILE=../../junit.xml' - cp -Rf $APPDATA/cabal cabal-cache cache: - key: windows - paths: - - cabal-cache - - ghc-8.6.2 - - ghc-tarballs + key: x86_64-windows tags: - x86_64-windows |