From 4d02e9d463cbd38e4bbee0badfc54d6b0e66379d Mon Sep 17 00:00:00 2001 From: diekleinekuh Date: Thu, 13 Jul 2023 08:26:06 +0000 Subject: [PATCH] ci: support overriding branch of dependency libs (cherry picked from commit b3e1edaf1afc28a92dfcc52ab0fb1e8a97b446bb) --- .gitlab-ci.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cdcf76f1..5cee6289 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,6 +20,9 @@ stages: gobject-introspection python-is-python3 libsystemd-dev libpolkit-gobject-1-dev valac libdbus-1-dev bash-completion udev policykit-1 help2man + LIBQMI_BRANCH: 'main' + LIBQRTR_BRANCH: 'main' + LIBMBIM_BRANCH: 'main' build container: extends: @@ -40,7 +43,7 @@ before_script: .prepare_deps: &prepare_deps - > if [ "$BUILD_MBIM" == "true" ]; then - git clone --depth 1 https://gitlab.freedesktop.org/mobile-broadband/libmbim.git + git clone --depth 1 --branch ${LIBMBIM_BRANCH} https://gitlab.freedesktop.org/mobile-broadband/libmbim.git pushd libmbim meson setup build --prefix=/usr -Dgtk_doc=false -Dintrospection=false -Dbash_completion=false ninja -C build @@ -49,7 +52,7 @@ before_script: fi - > if [ "$BUILD_QRTR" == "true" ]; then - git clone --depth 1 https://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib.git + git clone --depth 1 --branch ${LIBQRTR_BRANCH} https://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib.git pushd libqrtr-glib meson setup build --prefix=/usr -Dgtk_doc=false -Dintrospection=false ninja -C build @@ -58,7 +61,7 @@ before_script: fi - > if [ "$BUILD_QMI" == "true" ]; then - git clone --depth 1 https://gitlab.freedesktop.org/mobile-broadband/libqmi.git + git clone --depth 1 --branch ${LIBQMI_BRANCH} https://gitlab.freedesktop.org/mobile-broadband/libqmi.git pushd libqmi meson setup build --prefix=/usr -Dgtk_doc=false -Dintrospection=false -Dbash_completion=false -Dmbim_qmux=$BUILD_MBIM -Dqrtr=$BUILD_QRTR -Dcollection=basic ninja -C build