summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Withnall <philip@tecnocode.co.uk>2018-08-11 21:36:44 +0000
committerPhilip Withnall <philip@tecnocode.co.uk>2018-08-11 21:36:44 +0000
commit159757dbd00c43cc3df091d2656a85c2c4e5ff3a (patch)
tree5b182e7514b9c0e6505692fb58fd63c8e17911ef
parent5a75f4d0d178e3035a69e2628dc575e9bc80cf98 (diff)
parent0c9cf65d39dedc4ad3972b78f406929ba17d2026 (diff)
downloaddconf-159757dbd00c43cc3df091d2656a85c2c4e5ff3a.tar.gz
Merge branch 'ci' into 'master'
ci: Fix documentation build for `pages` job See merge request GNOME/dconf!12
-rw-r--r--.gitlab-ci.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3bbe08f..fb023cd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -67,10 +67,10 @@ pages:
only:
- master
script:
- - meson -Ddocumentation=true _build .
+ - meson -Denable-gtk-doc=true _build .
- ninja -C _build dconf-doc
- mkdir -p public/
- - mv _build/dconf/docs/html/ public/docs/
+ - mv _build/docs/html/ public/docs/
- mv _coverage/ public/coverage/
artifacts:
paths: