diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2019-03-19 14:25:16 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2019-03-21 15:29:55 -0400 |
| commit | 2f196a5cbed8f92ee0c723a3cb14b2523f1a484b (patch) | |
| tree | c0aad8422284ef2e9df194b69de13055d68e3b52 | |
| parent | fd4637c8d9821088abe1f12635fc9989a2f69ac4 (diff) | |
| download | haskell-2f196a5cbed8f92ee0c723a3cb14b2523f1a484b.tar.gz | |
Introduce i386-windows job
| -rw-r--r-- | .gitlab-ci.yml | 34 | ||||
| -rw-r--r-- | .gitlab/win32-init.sh | 14 |
2 files changed, 45 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f8c7f73e39..e33f3629ed 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -377,11 +377,11 @@ validate-x86_64-windows: variables: GHC_VERSION: "8.6.2" LANG: "en_US.UTF-8" + MSYSTEM: MINGW64 script: - | - 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 './configure --with-ghc=`pwd`/toolchain/bin/ghc --enable-tarballs-autodownload HappyCmd=`pwd`/toolchain/bin/happy AlexCmd=`pwd`/toolchain/bin/alex --target=x86_64-unknown-mingw32' - bash -c "PATH=`pwd`/toolchain/bin:$PATH make -j`mk/detect-cpu-count.sh`" - | bash -c "make binary-dist TAR_COMP_OPTS=-1" @@ -399,3 +399,33 @@ validate-x86_64-windows: - ghc.tar.xz - junit.xml +validate-i386-windows: + extends: .validate-windows + stage: build + # due to #16084 + allow_failure: true + variables: + GHC_VERSION: "8.6.2" + LANG: "en_US.UTF-8" + MSYSTEM: MINGW32 + script: + - | + python boot + bash -c './configure --with-ghc=`pwd`/toolchain/bin/ghc --enable-tarballs-autodownload HappyCmd=`pwd`/toolchain/bin/happy AlexCmd=`pwd`/toolchain/bin/alex --target=i386-unknown-mingw32' + - bash -c "PATH=`pwd`/toolchain/bin:$PATH make -j`mk/detect-cpu-count.sh`" + - | + bash -c "make binary-dist TAR_COMP_OPTS=-1" + mv ghc-*.tar.xz ghc.tar.xz + - bash -c 'make V=0 test THREADS=`mk/detect-cpu-count.sh` JUNIT_FILE=../../junit.xml' + cache: + key: i386-windows + tags: + - x86_64-windows + artifacts: + when: always + reports: + junit: junit.xml + paths: + - ghc.tar.xz + - junit.xml + diff --git a/.gitlab/win32-init.sh b/.gitlab/win32-init.sh index dce9be8d16..aacb6d7af6 100644 --- a/.gitlab/win32-init.sh +++ b/.gitlab/win32-init.sh @@ -10,7 +10,19 @@ if [ -d "`pwd`/cabal-cache" ]; then fi if [ ! -e $toolchain/bin/ghc ]; then - curl https://downloads.haskell.org/~ghc/$GHC_VERSION/ghc-$GHC_VERSION-x86_64-unknown-mingw32.tar.xz | tar -xJ + case $MSYSTEM in + MINGW32) + triple="i386-unknown-mingw32" + ;; + MINGW64) + triple="x86_64-unknown-mingw32" + ;; + *) + echo "win32-init: Unknown MSYSTEM $MSYSTEM" + exit 1 + ;; + esac + curl https://downloads.haskell.org/~ghc/$GHC_VERSION/ghc-$GHC_VERSION-$triple.tar.xz | tar -xJ mv ghc-$GHC_VERSION toolchain fi |