From 08e1d42a36b48a3f16611b1fee476cc48f676efb Mon Sep 17 00:00:00 2001 From: Marius Vlad Date: Tue, 11 Jun 2019 11:57:40 +0300 Subject: [PATCH] gitlab-ci: Install doxygen/sphinx/breathe and enable building documentation Pinned down sphinx to 2.1.0 and breathe to 4.13. Signed-off-by: Marius Vlad --- .gitlab-ci.yml | 4 ++-- .gitlab-ci/debian-install.sh | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ca0f6115..d06e7dcd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,7 +5,7 @@ variables: DEBIAN_VERSION: stretch DEBIAN_EXEC: 'bash .gitlab-ci/debian-install.sh' - DEBIAN_TAG: '2019-03-28.0' + DEBIAN_TAG: '2019-06-14.0' DEBIAN_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/debian/$DEBIAN_VERSION:$DEBIAN_TAG @@ -51,7 +51,7 @@ build-native-meson: script: - export PATH=~/.local/bin:$PATH - cd "$BUILDDIR" - - meson --prefix="$PREFIX" -Dsimple-dmabuf-drm=intel -Dwerror=true .. + - meson --prefix="$PREFIX" -Dsimple-dmabuf-drm=intel -Dwerror=true -Ddoc=true .. - ninja -k0 - ninja install - ninja test diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh index 758c15dd..63d7de41 100644 --- a/.gitlab-ci/debian-install.sh +++ b/.gitlab-ci/debian-install.sh @@ -4,9 +4,13 @@ set -o xtrace echo 'deb http://deb.debian.org/debian stretch-backports main' >> /etc/apt/sources.list apt-get update -apt-get -y --no-install-recommends install build-essential automake autoconf libtool pkg-config libexpat1-dev libffi-dev libxml2-dev libpixman-1-dev libpng-dev libjpeg-dev libcolord-dev mesa-common-dev libglu1-mesa-dev libegl1-mesa-dev libgles2-mesa-dev libwayland-dev libxcb1-dev libxcb-composite0-dev libxcb-xfixes0-dev libxcb-xkb-dev libx11-xcb-dev libx11-dev libudev-dev libgbm-dev libxkbcommon-dev libcairo2-dev libpango1.0-dev libgdk-pixbuf2.0-dev libxcursor-dev libmtdev-dev libpam0g-dev libvpx-dev libsystemd-dev libevdev-dev libinput-dev libwebp-dev libjpeg-dev libva-dev liblcms2-dev git libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev freerdp2-dev curl python3-pip python3-setuptools ninja-build +apt-get -y --no-install-recommends install build-essential automake autoconf libtool pkg-config libexpat1-dev libffi-dev libxml2-dev libpixman-1-dev libpng-dev libjpeg-dev libcolord-dev mesa-common-dev libglu1-mesa-dev libegl1-mesa-dev libgles2-mesa-dev libwayland-dev libxcb1-dev libxcb-composite0-dev libxcb-xfixes0-dev libxcb-xkb-dev libx11-xcb-dev libx11-dev libudev-dev libgbm-dev libxkbcommon-dev libcairo2-dev libpango1.0-dev libgdk-pixbuf2.0-dev libxcursor-dev libmtdev-dev libpam0g-dev libvpx-dev libsystemd-dev libevdev-dev libinput-dev libwebp-dev libjpeg-dev libva-dev liblcms2-dev git libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev freerdp2-dev curl python3-pip python3-setuptools doxygen ninja-build pip3 install --user git+https://github.com/mesonbuild/meson.git@0.49 +# for documentation +pip3 install sphinx==2.1.0 --user +pip3 install breathe==4.13.0.post0 --user +pip3 install sphinx_rtd_theme==0.4.3 --user mkdir -p /tmp/.X11-unix chmod 777 /tmp/.X11-unix