From f699a299ad9dd53fa38a525f8de4b3ea21f66b1c Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@gnome.org>
Date: Sun, 8 Mar 2020 14:37:00 +0000
Subject: ci: Build API reference separately

We don't want to spend a lot of time on it just to check the build.
---
 .gitlab-ci/test-docker-autotools.sh | 22 +++++++++++++++++-----
 .gitlab-ci/test-docker-meson.sh     |  6 ++----
 2 files changed, 19 insertions(+), 9 deletions(-)

(limited to '.gitlab-ci')

diff --git a/.gitlab-ci/test-docker-autotools.sh b/.gitlab-ci/test-docker-autotools.sh
index d991842cf1..c685cc05a9 100755
--- a/.gitlab-ci/test-docker-autotools.sh
+++ b/.gitlab-ci/test-docker-autotools.sh
@@ -5,19 +5,31 @@ set -e
 mkdir -p _ccache
 export CCACHE_BASEDIR="$(pwd)"
 export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache"
+export N_PROCS=$(($(nproc) - 1))
+
+EXTRA_CONFIGURE_OPT=""
+
+# Only enable documentation when distchecking, since it's required
+if [ -n "${DO_DISTCHECK-}" ]; then
+    EXTRA_CONFIGURE_OPTS="${EXTRA_CONFIGURE_OPTS} --enable-gtk-doc"
+fi
+
+NOCONFIGURE=1 ./autogen.sh
 
 mkdir _build
 cd _build
-../autogen.sh \
+
+../configure \
     --enable-cloudproviders \
     --enable-broadway-backend \
     --enable-wayland-backend \
     --enable-x11-backend \
     --enable-xinerama \
-    --enable-gtk-doc
-make -j8
+    ${EXTRA_CONFIGURE_OPTS}
+
+make -j${N_PROCS}
 
 if [ -n "${DO_DISTCHECK-}" ]; then
-  make -j8 check SKIP_GDKTARGET="echo Not actually running tests for now"
-  make -j8 distcheck SKIP_GDKTARGET="echo Not actually running tests for now"
+  make -j${N_PROCS} check SKIP_GDKTARGET="echo Not actually running tests for now"
+  make -j${N_PROCS} distcheck SKIP_GDKTARGET="echo Not actually running tests for now"
 fi
diff --git a/.gitlab-ci/test-docker-meson.sh b/.gitlab-ci/test-docker-meson.sh
index df3ed90ef8..469af621f7 100755
--- a/.gitlab-ci/test-docker-meson.sh
+++ b/.gitlab-ci/test-docker-meson.sh
@@ -10,10 +10,10 @@ export PATH="${HOME}/.local/bin:${PATH}"
 python3 -m pip install --user meson==0.49.2
 
 meson \
-    -Dgtk_doc=true \
-    -Dman=true \
     -Dinstalled_tests=true \
     -Dbroadway_backend=true \
+    -Dx11_backend=true \
+    -Dwayland_backend=true \
     -Dxinerama=yes \
     -Dprint_backends="file,lpr,test,cloudprint,cups" \
     ${EXTRA_MESON_FLAGS:-} \
@@ -28,5 +28,3 @@ xvfb-run -a -s "-screen 0 1024x768x24" \
         --print-errorlogs \
         --suite=gtk+-3.0 \
         --no-suite=gtk+-3.0:a11y
-
-ninja gail-libgail-util3-doc gdk3-doc gtk3-doc
-- 
cgit v1.2.1