summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Morgado <aleksander@aleksander.es>2021-09-06 10:19:29 +0200
committerAleksander Morgado <aleksander@aleksander.es>2021-09-06 10:19:29 +0200
commite8037fc5e9138ba23a80be3698cf36899a003aa7 (patch)
tree3587a471d465904755801b79cb01b37bc22d50e9
parent236978c0ae59bb6553c3e90a1069ce2a49955366 (diff)
ci: updated introspection tests
-rw-r--r--.gitlab-ci.yml31
1 files changed, 26 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4e907f4..2e8bcfc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -62,7 +62,7 @@ build-meson-default:
- ninja -C _release_build
- ninja -C _release_build install
-build-meson-no-qrtr-no-mbim-no-rmnet:
+build-meson-no-qrtr-no-mbim-no-rmnet-no-introspection:
stage: build
extends:
- .fdo.distribution-image@ubuntu
@@ -96,11 +96,11 @@ build-meson-no-rmnet:
- 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=false
+ - meson setup build --prefix=/usr -Dgtk_doc=false -Dintrospection=true
- ninja -C build
- ninja -C build install
- popd
- - meson setup build --prefix=/usr -Dwerror=true -Dgtk_doc=false -Dintrospection=false -Dmbim_qmux=true -Dqrtr=true -Drmnet=false
+ - meson setup build --prefix=/usr -Dwerror=true -Dgtk_doc=false -Dintrospection=true -Dmbim_qmux=true -Dqrtr=true -Drmnet=false
- ninja -C build
- ninja -C build install
@@ -121,6 +121,27 @@ build-meson-no-qrtr:
- ninja -C build
- ninja -C build install
- popd
+ - meson setup build --prefix=/usr -Dwerror=true -Dgtk_doc=false -Dintrospection=true -Dmbim_qmux=true -Dqrtr=false -Drmnet=true
+ - ninja -C build
+ - ninja -C build install
+
+build-meson-no-qrtr-no-introspection:
+ stage: build
+ extends:
+ - .fdo.distribution-image@ubuntu
+ - .common_variables
+ only:
+ - master
+ - merge_requests
+ - tags
+ - schedules
+ 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
+ - ninja -C build
+ - ninja -C build install
+ - popd
- meson setup build --prefix=/usr -Dwerror=true -Dgtk_doc=false -Dintrospection=false -Dmbim_qmux=true -Dqrtr=false -Drmnet=true
- ninja -C build
- ninja -C build install
@@ -138,11 +159,11 @@ 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=false
+ - meson setup build --prefix=/usr -Dgtk_doc=false -Dintrospection=true
- ninja -C build
- ninja -C build install
- popd
- - meson setup build --prefix=/usr -Dwerror=true -Dgtk_doc=false -Dintrospection=false -Dmbim_qmux=false -Dqrtr=true -Drmnet=true
+ - meson setup build --prefix=/usr -Dwerror=true -Dgtk_doc=false -Dintrospection=true -Dmbim_qmux=false -Dqrtr=true -Drmnet=true
- ninja -C build
- ninja -C build install