summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Morgado <aleksander@aleksander.es>2021-08-06 10:43:54 +0200
committerAleksander Morgado <aleksander@aleksander.es>2021-08-06 15:13:20 +0200
commit92298cf324bbf1cb2a6b42a6460afe4baee4f86a (patch)
tree2f160ac7a228437d2820e8507276f71cbad8c58e
parentb9fc5b7e1044db58ac7b2eaee46233d3d684fb80 (diff)
ci: switch to build libqrtr-glib from git using meson
(cherry picked from commit d3bafc485f9a70ea469c0b815d33171a2a88e08a)
-rw-r--r--.gitlab-ci.yml28
1 files changed, 12 insertions, 16 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8d4bb47..b9b8658 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -50,10 +50,9 @@ build-meson-default:
- popd
- git clone --depth 1 https://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib.git
- pushd libqrtr-glib
- - NOCONFIGURE=1 ./autogen.sh
- - ./configure --prefix=/usr --enable-gtk-doc --enable-introspection
- - make
- - make install
+ - meson setup build --prefix=/usr -Dgtk_doc=false -Dintrospection=true
+ - ninja -C build
+ - ninja -C build install
- popd
- meson setup _debug_build --prefix=/usr -Dwerror=true -Dgtk_doc=false -Dintrospection=true -Dmbim_qmux=true -Dqrtr=true -Drmnet=true
- ninja -C _debug_build
@@ -97,10 +96,9 @@ build-meson-no-rmnet:
- popd
- git clone --depth 1 https://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib.git
- pushd libqrtr-glib
- - NOCONFIGURE=1 ./autogen.sh
- - ./configure --prefix=/usr --enable-gtk-doc --enable-introspection
- - make
- - make install
+ - 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=true -Drmnet=false
- ninja -C build
@@ -140,10 +138,9 @@ build-meson-no-mbim:
script:
- git clone --depth 1 https://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib.git
- pushd libqrtr-glib
- - NOCONFIGURE=1 ./autogen.sh
- - ./configure --prefix=/usr --enable-gtk-doc --enable-introspection
- - make
- - make install
+ - 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=false -Dqrtr=true -Drmnet=true
- ninja -C build
@@ -162,10 +159,9 @@ build-meson-no-mbim-no-introspection:
script:
- git clone --depth 1 https://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib.git
- pushd libqrtr-glib
- - NOCONFIGURE=1 ./autogen.sh
- - ./configure --prefix=/usr --enable-gtk-doc --disable-introspection
- - make
- - make install
+ - 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=false -Dqrtr=true -Drmnet=true
- ninja -C build