diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2019-03-05 16:41:55 -0500 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-03-19 23:04:18 -0400 |
| commit | 71648c35ad243396433d017da9ce18bea603d1ce (patch) | |
| tree | fc462caf1c9356dc7e4cb1ef3738cd9aeee6f004 /.gitlab-ci.yml | |
| parent | acf2129d49989071e296634711e3f4d9ebed6ee0 (diff) | |
| download | haskell-71648c35ad243396433d017da9ce18bea603d1ce.tar.gz | |
gitlab-ci: Implement support for i386/Windows bindists
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 63 |
1 files changed, 50 insertions, 13 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c135c457c3..5f741e1d6c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -394,7 +394,7 @@ validate-x86_64-linux-fedora27: # Validation via Pipelines (Windows) ############################################################ -.validate-windows: +.build-windows: before_script: - git clean -xdf - git submodule foreach git clean -xdf @@ -420,29 +420,26 @@ validate-x86_64-linux-fedora27: dependencies: [] variables: FORCE_SYMLINKS: 1 + LANG: "en_US.UTF-8" cache: paths: - cabal-cache - ghc-8.6.2 - ghc-tarballs -validate-x86_64-windows-hadrian: - extends: .validate-windows +.build-windows-hadrian: + extends: .build-windows stage: full-build variables: GHC_VERSION: "8.6.2" - LANG: "en_US.UTF-8" script: - | - 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 "PATH=`pwd`/toolchain/bin:$PATH hadrian/build.cabal.sh -j`mk/detect-cpu-count.sh` --flavour=Quick --docs=no-sphinx binary-dist" - mv _build/bindist/ghc*.tar.xz ghc.tar.xz # 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: - x86_64-windows artifacts: @@ -450,36 +447,76 @@ validate-x86_64-windows-hadrian: paths: - ghc.tar.xz -validate-x86_64-windows: - extends: .validate-windows +validate-x86_64-windows-hadrian: + extends: .build-windows-hadrian + variables: + MSYSTEM: MINGW64 + cache: + key: x86_64-windows-hadrian + +nightly-i386-windows-hadrian: + extends: .build-windows-hadrian + variables: + MSYSTEM: MINGW32 + only: + variables: + - $NIGHTLY + cache: + key: i386-windows-hadrian + +.build-windows-make: + extends: .build-windows stage: full-build # due to #16084 allow_failure: true variables: GHC_VERSION: "8.6.2" - LANG: "en_US.UTF-8" BIN_DIST_PREP_TAR_COMP: "bindistprep/ghc-x86_64-mingw32.tar.xz" script: - | - 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 "PATH=`pwd`/toolchain/bin:$PATH make -j`mk/detect-cpu-count.sh`" - bash -c "PATH=`pwd`/toolchain/bin:$PATH make binary-dist TAR_COMP_OPTS=-1" - bash -c 'make V=0 test THREADS=`mk/detect-cpu-count.sh` JUNIT_FILE=../../junit.xml' - cache: - key: x86_64-windows tags: - x86_64-windows artifacts: when: always + expire_in: 2 week reports: junit: junit.xml paths: - ghc-*.tar.xz - junit.xml +validate-x86_64-windows: + extends: .build-windows-make + variables: + MSYSTEM: MINGW64 + cache: + key: x86_64-windows + +release-i386-windows: + extends: .build-windows-make + only: + - tags + variables: + MSYSTEM: MINGW32 + cache: + key: i386-windows + +nightly-i386-windows: + extends: .build-windows-make + only: + variables: + - $NIGHTLY + variables: + MSYSTEM: MINGW32 + cache: + key: i386-windows + ############################################################ # Cleanup ############################################################ |