diff options
| author | Simon McVittie <smcv@collabora.com> | 2022-06-27 11:14:06 +0100 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2022-07-13 20:36:13 +0100 |
| commit | d8160bdcfa8f87e1807303d8f4211e935128b4e0 (patch) | |
| tree | 99b09579eef71cf71386b9166f07831e0cc8f8b9 /tools | |
| parent | d946c02289f3c20152e87797eb6ac52c07d1dd3c (diff) | |
| download | dbus-d8160bdcfa8f87e1807303d8f4211e935128b4e0.tar.gz | |
CI: Enable Ducktype-based documentation on Debian/Ubuntu
We don't currently know the equivalent of python3-mallard-ducktype on
other OSs like openSUSE, but we know this should work on Debian (it does
when we do Autotools builds).
Signed-off-by: Simon McVittie <smcv@collabora.com>
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/ci-build.sh | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/tools/ci-build.sh b/tools/ci-build.sh index 2e31e424..559713a6 100755 --- a/tools/ci-build.sh +++ b/tools/ci-build.sh @@ -477,6 +477,17 @@ case "$ci_buildsys" in ;; esac + case "$ci_distro" in + (debian*|ubuntu*) + # We know how to install python3-mallard-ducktype + ;; + (*) + # TODO: We don't know the openSUSE equivalent of + # python3-mallard-ducktype + set -- -Dducktype_docs=disabled "$@" + ;; + esac + set -- -Dmodular_tests=enabled "$@" case "$ci_variant" in @@ -514,8 +525,7 @@ case "$ci_buildsys" in # the wrap mode back, so we can use wraps. set -- "$@" --wrap=default - # FIXME: ducktype target fails on debian CI.. - $meson_setup -Dducktype_docs=disabled "$@" "$srcdir" + $meson_setup "$@" "$srcdir" meson compile -v [ "$ci_test" = no ] || meson test DESTDIR=DESTDIR meson install |