From 180bd633810d7107b9041441dc768bda72c83c72 Mon Sep 17 00:00:00 2001 From: Aleksander Morgado Date: Fri, 6 Aug 2021 10:18:46 +0200 Subject: [PATCH] ci: switch to build libqrtr-glib from git using meson --- .gitlab-ci.yml | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c52ab8ca..61e53b74 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -68,10 +68,9 @@ build-qmi-qrtr-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 --disable-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 - git clone --depth 1 https://gitlab.freedesktop.org/mobile-broadband/libqmi.git - pushd libqmi @@ -164,10 +163,9 @@ build-single-plugins: - popd - git clone --depth 1 https://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib.git - pushd libqrtr-glib - - NOCONFIGURE=1 ./autogen.sh - - ./configure --prefix=/usr --disable-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 - git clone --depth 1 https://gitlab.freedesktop.org/mobile-broadband/libqmi.git - pushd libqmi @@ -204,10 +202,9 @@ build-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 --disable-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 - git clone --depth 1 https://gitlab.freedesktop.org/mobile-broadband/libqmi.git - pushd libqmi