summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIñigo Martínez <inigomartinez@gmail.com>2021-09-13 11:15:55 +0200
committerIñigo Martínez <inigomartinez@gmail.com>2021-09-13 11:15:55 +0200
commite958dcc9a834ef75e352117ec78522fc38ee6d5b (patch)
tree866e6750f8e48c88e942d9addb7bfe56e72a6b6d
parent8dc4212d1c39141f6335e9a034ecfa851daa4439 (diff)
ci: Use feature values for libmbim and libqrtr-glib
Both `libmbim` and `libqrtr-glib` have started using `feature` options in their meson builds. The CI options when building `libmbim` and `libqrtr-glib` have been updated to use `feature` option values.
-rw-r--r--.gitlab-ci.yml16
1 files changed, 8 insertions, 8 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 002a4ca..43969de 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -44,13 +44,13 @@ build-meson-default:
script:
- git clone --depth 1 https://gitlab.freedesktop.org/mobile-broadband/libmbim.git
- pushd libmbim
- - meson setup build --prefix=/usr -Dgtk_doc=false -Dintrospection=true
+ - meson setup build --prefix=/usr -Dgtk_doc=false -Dintrospection=enabled
- ninja -C build
- ninja -C build install
- popd
- git clone --depth 1 https://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib.git
- pushd libqrtr-glib
- - meson setup build --prefix=/usr -Dgtk_doc=false -Dintrospection=true
+ - meson setup build --prefix=/usr -Dgtk_doc=false -Dintrospection=enabled
- ninja -C build
- ninja -C build install
- popd
@@ -90,13 +90,13 @@ build-meson-no-rmnet:
script:
- git clone --depth 1 https://gitlab.freedesktop.org/mobile-broadband/libmbim.git
- pushd libmbim
- - meson setup build --prefix=/usr -Dgtk_doc=false -Dintrospection=true
+ - meson setup build --prefix=/usr -Dgtk_doc=false -Dintrospection=enabled
- ninja -C build
- ninja -C build install
- popd
- git clone --depth 1 https://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib.git
- pushd libqrtr-glib
- - meson setup build --prefix=/usr -Dgtk_doc=false -Dintrospection=true
+ - meson setup build --prefix=/usr -Dgtk_doc=false -Dintrospection=enabled
- ninja -C build
- ninja -C build install
- popd
@@ -117,7 +117,7 @@ build-meson-no-qrtr:
script:
- git clone --depth 1 https://gitlab.freedesktop.org/mobile-broadband/libmbim.git
- pushd libmbim
- - meson setup build --prefix=/usr -Dgtk_doc=false -Dintrospection=true
+ - meson setup build --prefix=/usr -Dgtk_doc=false -Dintrospection=enabled
- ninja -C build
- ninja -C build install
- popd
@@ -138,7 +138,7 @@ build-meson-no-qrtr-no-introspection:
script:
- git clone --depth 1 https://gitlab.freedesktop.org/mobile-broadband/libmbim.git
- pushd libmbim
- - meson setup build --prefix=/usr -Dgtk_doc=false -Dintrospection=false
+ - meson setup build --prefix=/usr -Dgtk_doc=false -Dintrospection=disabled
- ninja -C build
- ninja -C build install
- popd
@@ -159,7 +159,7 @@ build-meson-no-mbim:
script:
- git clone --depth 1 https://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib.git
- pushd libqrtr-glib
- - meson setup build --prefix=/usr -Dgtk_doc=false -Dintrospection=true
+ - meson setup build --prefix=/usr -Dgtk_doc=false -Dintrospection=enabled
- ninja -C build
- ninja -C build install
- popd
@@ -180,7 +180,7 @@ build-meson-no-mbim-no-introspection:
script:
- git clone --depth 1 https://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib.git
- pushd libqrtr-glib
- - meson setup build --prefix=/usr -Dgtk_doc=false -Dintrospection=false
+ - meson setup build --prefix=/usr -Dgtk_doc=false -Dintrospection=disabled
- ninja -C build
- ninja -C build install
- popd