From fcb3dfcf1a23b0ed2832137a9fc6e9ccf9163ec0 Mon Sep 17 00:00:00 2001 From: Aaron Plattner Date: Wed, 17 Apr 2019 10:47:26 -0700 Subject: CI: Build documentation Update the CI build environment to install doxygen and graphviz. Deploy the generated documentation as pages. Signed-off-by: Aaron Plattner --- .gitlab-ci.yml | 33 ++++++++++++++++++++++----------- test/gitlab-ci.sh | 5 +++-- 2 files changed, 25 insertions(+), 13 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7e45978..6393142 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,13 +1,24 @@ -image: docker:latest -services: - - docker:dind +image: archlinux/base:latest -before_script: - - echo FROM nwnk/xserver-travis-rawhide:v5 > Dockerfile - - echo ADD . /root >> Dockerfile - - echo WORKDIR /root >> Dockerfile - - docker build -t withgit . +stages: + - build + - deploy -job: - script: - - docker run --volume $HOME/.ccache:/root/.ccache withgit ./test/gitlab-ci.sh +build: + stage: build + script: + - pacman --noconfirm -Sy gcc meson ninja pkg-config doxygen graphviz texlive-bin + - ./test/gitlab-ci.sh + artifacts: + paths: + - public + +pages: + stage: deploy + script: + - echo "Nothing to do" + artifacts: + paths: + - public + only: + - master diff --git a/test/gitlab-ci.sh b/test/gitlab-ci.sh index ac93cac..6c468b3 100755 --- a/test/gitlab-ci.sh +++ b/test/gitlab-ci.sh @@ -1,6 +1,7 @@ #!/bin/sh -set -x +set -xe meson setup build/ -meson configure -Dprefix=/usr -Ddri2=true build/ +meson configure -Dprefix=/usr -Ddri2=true -Ddocumentation=true build/ ninja -C build/ install test +cp -av build/doc/html public/ -- cgit v1.2.3