diff options
author | Daniel Playfair Cal <daniel.playfair.cal@gmail.com> | 2018-08-13 23:46:06 +0000 |
---|---|---|
committer | Daniel Playfair Cal <daniel.playfair.cal@gmail.com> | 2018-08-13 23:46:06 +0000 |
commit | 060b9a177e7c128a52c2ba018feb891f4df94e32 (patch) | |
tree | f140525ff72578d7e2ba4c6d44af8c316544742f /.gitlab-ci.yml | |
parent | 923096aac41199d8e6ec1bc3df211d36ab1607a1 (diff) | |
parent | 79487f7484ab2aa2518e6ef4ea04327257386947 (diff) | |
download | dconf-060b9a177e7c128a52c2ba018feb891f4df94e32.tar.gz |
Merge branch 'fix/build-gtk-doc' into 'master'
Build: revert to the old "enable-gtk-doc" flag since there is no reason to change it
See merge request GNOME/dconf!18
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r-- | .gitlab-ci.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 868c797..a12002c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,7 +19,7 @@ variables: build-job: stage: build script: - - meson -Db_coverage=true -Dman=true -Dgtk_doc=true --buildtype debug --werror _build . + - meson -Db_coverage=true -Dman=true -Denable-gtk-doc=true --buildtype debug --werror _build . - ninja -C _build all dconf-doc except: - tags @@ -32,7 +32,7 @@ build-job: test: stage: test script: - - meson _build . -Db_coverage=true -Dman=true -Dgtk_doc=true + - meson _build . -Db_coverage=true -Dman=true -Denable-gtk-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" @@ -67,7 +67,7 @@ pages: only: - master script: - - meson -Db_coverage=true -Dgtk_doc=true _build . + - meson -Db_coverage=true -Denable-gtk-doc=true _build . - 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" |