From e658663ed172506e4a96634f0611abb64061890a Mon Sep 17 00:00:00 2001
From: Daniel Playfair Cal <daniel.playfair.cal@gmail.com>
Date: Mon, 13 Aug 2018 12:21:11 +1000
Subject: Correct the meson option to build gtk docs, also enable man pages and
 gtk docs in the build and test stage to catch errors earlier

---
 .gitlab-ci.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to '.gitlab-ci.yml')

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 74633f6..e355de3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,8 +19,8 @@ variables:
 build-job:
   stage: build
   script:
-    - meson --buildtype debug --werror _build .
-    - ninja -C _build
+    - meson -Db_coverage=true -Dman=true -Dgtk_doc=true --buildtype debug --werror _build .
+    - ninja -C _build all dconf-doc
   except:
     - tags
   artifacts:
@@ -32,8 +32,8 @@ build-job:
 test:
   stage: test
   script:
-    - meson _build . -Db_coverage=true
-    - ninja -C _build
+    - meson _build . -Db_coverage=true -Dman=true -Dgtk_doc=true
+    - ninja -C _build all dconf-doc
     - mkdir -p _coverage
     - lcov --rc lcov_branch_coverage=1 --directory _build --capture --initial --output-file "_coverage/${CI_JOB_NAME}-baseline.lcov"
     - meson test -C _build --timeout-multiplier ${MESON_TEST_TIMEOUT_MULTIPLIER}
@@ -67,7 +67,7 @@ pages:
   only:
     - master
   script:
-    - meson -Denable-gtk-doc=true _build .
+    - meson -Dgtk_doc=true _build .
     - ninja -C _build dconf-doc
     - mkdir -p public/
     - mv _build/docs/html/ public/docs/
-- 
cgit v1.2.1