diff options
author | Christoph Reiter <reiter.christoph@gmail.com> | 2019-09-28 17:29:35 +0200 |
---|---|---|
committer | Christoph Reiter <reiter.christoph@gmail.com> | 2019-09-30 17:22:37 +0200 |
commit | efbd35d290d35e37994d441c9f2e4c0dffcd9cec (patch) | |
tree | 24f6f060cc812fb1eed1495a8220c157fadfa19d /.gitlab-ci.yml | |
parent | 1cb3b2b27f824f3bbdab1a2e3fedf45a39689019 (diff) | |
download | gobject-introspection-efbd35d290d35e37994d441c9f2e4c0dffcd9cec.tar.gz |
meson: change "doctool" from a boolean to a feature option
Similar to !180 this should prevent devs from not running all tests by
accident.
This also adds some checks for the required doctool dependencies, mako and markdown.
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r-- | .gitlab-ci.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 800f07bc..f28c3b67 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,7 +16,7 @@ fedora-x86_64-meson: CFLAGS: "-Werror" script: - python3 -m pip install --user mako markdown - - meson --prefix /usr --libdir /usr/lib64 --buildtype debug -Ddoctool=true -Dgtk_doc=true -Dcairo=enabled -Dpython=python3 _build . + - meson --prefix /usr --libdir /usr/lib64 --buildtype debug -Ddoctool=enabled -Dgtk_doc=true -Dcairo=enabled -Dpython=python3 _build . - cd _build - ninja - meson test --print-errorlogs --suite=gobject-introspection --no-suite=glib @@ -43,7 +43,7 @@ fedora-x86_64-python3.5: PYENV_VERSION: "3.5.6" script: - python3 -m pip install --user mako markdown - - meson --prefix /usr --libdir /usr/lib64 --buildtype debug -Ddoctool=true -Dgtk_doc=true -Dcairo=enabled -Dpython=python3 _build . + - meson --prefix /usr --libdir /usr/lib64 --buildtype debug -Ddoctool=enabled -Dgtk_doc=true -Dcairo=enabled -Dpython=python3 _build . - cd _build - ninja - meson test --print-errorlogs --suite=gobject-introspection --no-suite=glib |