From: Petr Špaček Date: Thu, 25 Jan 2018 12:53:17 +0000 (+0100) Subject: CI: test doc build X-Git-Tag: v2.0.0~11^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a11dbf2b6402a4bba570cf2e476e3816a0eb1451;p=thirdparty%2Fknot-resolver.git CI: test doc build --- diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7e46212fb..c4a23f4be 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -99,6 +99,20 @@ installcheck:linux:amd64: - linux - amd64 +doc: + stage: test + script: + - SPHINXFLAGS="-W" make doc + dependencies: [] + artifacts: + expire_in: 1 hour + paths: + - ./doc/* + tags: + - docker + + + deckard:linux:amd64: stage: test script: diff --git a/ci/Dockerfile b/ci/Dockerfile index 5a41587dc..86dba2022 100644 --- a/ci/Dockerfile +++ b/ci/Dockerfile @@ -10,6 +10,8 @@ RUN apt-get upgrade -y -qqq # Knot and Knot Resolver dependecies RUN apt-get install -y -qqq make cmake pkg-config git build-essential bsdmainutils libtool autoconf make pkg-config liburcu-dev libgnutls28-dev libedit-dev liblmdb-dev libcap-ng-dev libsystemd-dev libidn11-dev protobuf-c-compiler libfstrm-dev pkg-config libuv1-dev libcmocka-dev libluajit-5.1-dev lua-sec lua-socket lua-http +# documentation dependecies +RUN apt-get install -y -qqq doxygen python3-sphinx python3-breathe python3-sphinx-rtd-theme # Python packags required for Deckard CI # Python: grab latest versions from PyPi diff --git a/doc/doc.mk b/doc/doc.mk index 26a52bf63..58c299e34 100644 --- a/doc/doc.mk +++ b/doc/doc.mk @@ -2,7 +2,7 @@ ifeq ($(HAS_doxygen)|$(HAS_sphinx-build), yes|yes) doc-doxygen: @cd doc && $(doxygen_BIN) doc-html: doc-doxygen - @cd doc && $(sphinx-build_BIN) -b html . html + @cd doc && $(sphinx-build_BIN) $(SPHINXFLAGS) -b html . html else doc-html: $(error doxygen and sphinx must be installed)