diff options
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 34 |
1 files changed, 30 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 87a5333a9e..6b205bb95a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,6 +11,7 @@ stages: - lint - build - full-build + - packaging ############################################################ # Runner Tags @@ -92,8 +93,7 @@ validate-x86_64-linux-deb8-hadrian: THREADS=`mk/detect-cpu-count.sh` make V=0 -j$THREADS - | - make binary-dist TAR_COMP_OPTS="-1" - mv ghc-*.tar.xz ghc.tar.xz + make binary-dist TAR_COMP_OPTS="-1" BIN_DIST_NAME=ghc-bindist - | THREADS=`mk/detect-cpu-count.sh` make $TEST_TYPE THREADS=$THREADS JUNIT_FILE=../../junit.xml @@ -102,7 +102,7 @@ validate-x86_64-linux-deb8-hadrian: junit: junit.xml expire_in: 2 week paths: - - ghc.tar.xz + - ghc-bindist-*.tar.xz - junit.xml validate-x86_64-darwin: @@ -319,6 +319,9 @@ validate-x86_64-linux-deb9-unreg: - rd /s /q tmp - robocopy /np /nfl /ndl /e "%APPDATA%\cabal" cabal-cache - bash -c 'make clean || true' + artifacts: + paths: + - ghc-bindist-*.tar.xz cache: paths: - cabal-cache @@ -345,7 +348,7 @@ validate-x86_64-windows-hadrian: - 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' cache: - key: x86_64-windows + key: x86_64-windows-hadrian tags: - x86_64-windows @@ -364,6 +367,7 @@ validate-x86_64-windows: bash -c './configure --with-ghc=`pwd`/toolchain/bin/ghc --enable-tarballs-autodownload HappyCmd=`pwd`/toolchain/bin/happy AlexCmd=`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 BIN_DIST_NAME=ghc-bindist" - bash -c 'make V=0 test THREADS=`mk/detect-cpu-count.sh` JUNIT_FILE=../../junit.xml' cache: key: x86_64-windows @@ -371,6 +375,28 @@ validate-x86_64-windows: - x86_64-windows ############################################################ +# Packaging +############################################################ + +doc-tarball: + stage: packaging + tags: + - x86_64-linux + image: ghcci/x86_64-linux-deb9:0.2 + dependencies: + - validate-x86_64-linux-deb9 + - validate-x86_64-windows + artifacts: + paths: + - haddock.html.tar.xz + - libraries.html.tar.xz + - users_guide.html.tar.xz + - index.html + - "*.pdf" + script: + - distrib/mkDocs/mkDocs ghc-bindist-x86_64-unknown-linux.tar.xz ghc-bindist-x86_64-unknown-mingw32.tar.xz + +############################################################ # Validation via CircleCI ############################################################ |