summaryrefslogtreecommitdiff
path: root/.gitlab-ci
diff options
context:
space:
mode:
authorXavier Claessens <xavier.claessens@collabora.com>2020-09-30 09:41:28 -0400
committerXavier Claessens <xavier.claessens@collabora.com>2020-09-30 09:50:24 -0400
commit0e5dac8c25d11e3ce921c584c05064a93507393d (patch)
tree3921362d112aa05f4c5ffcc4ad05f1c758d23005 /.gitlab-ci
parent87393c7fb6d533dbc3eeab533312c99ab80c1754 (diff)
downloadgtk+-0e5dac8c25d11e3ce921c584c05064a93507393d.tar.gz
meson: Change introspection option to yielding feature
Yielding option means that if pango is built as a subproject, it will take the value of that option from the parent project (e.g. gst-build). For that to work it must be of the same type, which is "feature" instead of "boolean" in all GStreamer modules.
Diffstat (limited to '.gitlab-ci')
-rw-r--r--.gitlab-ci/flatpak-build.sh2
-rw-r--r--.gitlab-ci/test-msys2.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci/flatpak-build.sh b/.gitlab-ci/flatpak-build.sh
index cbb6c097d1..531741db1d 100644
--- a/.gitlab-ci/flatpak-build.sh
+++ b/.gitlab-ci/flatpak-build.sh
@@ -22,7 +22,7 @@ flatpak build ${builddir} meson \
-Dprint-backends=file \
-Dbuild-tests=false \
-Dbuild-examples=false \
- -Dintrospection=false \
+ -Dintrospection=disabled \
-Ddemos=true \
_flatpak_build
diff --git a/.gitlab-ci/test-msys2.sh b/.gitlab-ci/test-msys2.sh
index d311f4bbe7..dfa8813240 100644
--- a/.gitlab-ci/test-msys2.sh
+++ b/.gitlab-ci/test-msys2.sh
@@ -67,7 +67,7 @@ meson \
-Dwayland-backend=false \
-Dwin32-backend=true \
-Dvulkan=disabled \
- -Dintrospection=false \
+ -Dintrospection=disabled \
-Dgtk:werror=true \
_build
unset CCACHE_DISABLE