SymbX/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert ".gitlab-ci.yml: use meson instead of ninja where possible"

Browse Source 
This reverts commit ad6772df34.

The 'compile' command in meson was included in v0.53.0. Let's keep on
recommending the use of ninja to build everywhere.

Fixes https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/issues/844
This commit is contained in:
Aleksander Morgado
2024-04-01 10:10:01 +00:00
parent 3c4fa90c92
commit 609ff75033
1 changed files with 35 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitlab-ci.yml
+35 -21
View File
@@ -46,7 +46,8 @@ before_script:
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
meson install -C build
ninja -C build
ninja -C build install
popd
fi
- >
@@ -54,7 +55,8 @@ before_script:
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
meson install -C build
ninja -C build
ninja -C build install
popd
fi
- >
@@ -62,7 +64,8 @@ before_script:
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
meson install -C build
ninja -C build
ninja -C build install
popd
fi
@@ -81,7 +84,8 @@ build-no-qmi:
- export BUILD_QMI=false
- *prepare_deps
- meson setup build --prefix=/usr -Dwerror=true -Dgtk_doc=false -Dqmi=false -Dqrtr=false -Dmbim=true
- meson install -C build
- ninja -C build
- ninja -C build install
build-qmi-qrtr-no-mbim:
stage: build
@@ -97,7 +101,8 @@ build-qmi-qrtr-no-mbim:
- export BUILD_MBIM=false
- *prepare_deps
- meson setup build --prefix=/usr -Dwerror=true -Dgtk_doc=false -Dqmi=true -Dqrtr=true -Dmbim=false
- meson install -C build
- ninja -C build
- ninja -C build install
build-qmi-no-qrtr-no-mbim:
stage: build
@@ -114,7 +119,8 @@ build-qmi-no-qrtr-no-mbim:
- export BUILD_QRTR=false
- *prepare_deps
- meson setup build --prefix=/usr -Dwerror=true -Dgtk_doc=false -Dqmi=true -Dqrtr=false -Dmbim=false
- meson install -C build
- ninja -C build
- ninja -C build install
build-no-qmi-no-mbim:
stage: build
@@ -132,8 +138,9 @@ build-no-qmi-no-mbim:
- export BUILD_QMI=false
- *prepare_deps
- meson setup build --prefix=/usr -Dwerror=true -Dgtk_doc=false -Dqmi=false -Dqrtr=false -Dmbim=false
- meson test -C build
- meson install -C build
- ninja -C build
- ninja -C build test
- ninja -C build install
build-no-qmi-no-mbim-no-tests:
stage: build
@@ -151,7 +158,8 @@ build-no-qmi-no-mbim-no-tests:
- export BUILD_QMI=false
- *prepare_deps
- meson setup build --prefix=/usr -Dwerror=true -Dgtk_doc=false -Dqmi=false -Dqrtr=false -Dmbim=false -Dtests=false
- meson install -C build
- ninja -C build
- ninja -C build install
build-no-deprecated:
stage: build
@@ -169,8 +177,9 @@ build-no-deprecated:
- export BUILD_QMI=false
- *prepare_deps
- CFLAGS="-DMM_DISABLE_DEPRECATED" meson setup build --prefix=/usr -Dwerror=true -Dgtk_doc=false -Dqmi=false -Dqrtr=false -Dmbim=false
- meson test -C build
- meson install -C build
- ninja -C build
- ninja -C build test
- ninja -C build install
build-no-suspend-resume:
stage: build
@@ -185,7 +194,8 @@ build-no-suspend-resume:
script:
- *prepare_deps
- meson setup build --prefix=/usr -Dwerror=true -Dgtk_doc=false -Dsystemd_suspend_resume=false -Dpowerd_suspend_resume=false
- meson install -C build
- ninja -C build
- ninja -C build install
build-suspend-resume-powerd:
stage: build
@@ -200,7 +210,8 @@ build-suspend-resume-powerd:
script:
- *prepare_deps
- meson setup build --prefix=/usr -Dgtk_doc=false -Dsystemd_suspend_resume=false -Dpowerd_suspend_resume=true
- meson install -C build
- ninja -C build
- ninja -C build install
build-single-plugins:
stage: build
@@ -215,7 +226,7 @@ build-single-plugins:
- *prepare_deps
- for PLUGIN in $(grep "plugin_" meson_options.txt | awk -F"'" '{ print $2 }'); do
meson setup build_$PLUGIN --prefix=/usr -Dwerror=true -Dgtk_doc=false -Dintrospection=false -Dbash_completion=false -Dauto_features=disabled -D$PLUGIN=enabled;
meson compile -C build_$PLUGIN;
ninja -C build_$PLUGIN;
done
build-single-plugins-builtin:
@@ -231,7 +242,7 @@ build-single-plugins-builtin:
- *prepare_deps
- for PLUGIN in $(grep "plugin_" meson_options.txt | awk -F"'" '{ print $2 }'); do
meson setup build_$PLUGIN --prefix=/usr -Dgtk_doc=false -Dintrospection=false -Dbash_completion=false -Dauto_features=disabled -D$PLUGIN=enabled -Dbuiltin_plugins=true;
meson compile -C build_$PLUGIN;
ninja -C build_$PLUGIN;
done
build-debug:
@@ -247,8 +258,9 @@ build-debug:
script:
- *prepare_deps
- meson setup build --buildtype=debug --prefix=/usr -Dwerror=true -Dgtk_doc=true -Dpolkit=strict -Dsystemdsystemunitdir=/lib/systemd/system
- meson test -C build
- meson install -C build
- ninja -C build
- ninja -C build test
- ninja -C build install
- ninja -C build uninstall
build-release:
@@ -264,8 +276,9 @@ build-release:
script:
- *prepare_deps
- meson setup build --buildtype=release --prefix=/usr -Dwerror=true -Dgtk_doc=true -Dpolkit=strict -Dsystemdsystemunitdir=/lib/systemd/system
- meson test -C build
- meson install -C build
- ninja -C build
- ninja -C build test
- ninja -C build install
- ninja -C build uninstall
build-release-builtin:
@@ -281,6 +294,7 @@ build-release-builtin:
script:
- *prepare_deps
- meson setup build --buildtype=release --prefix=/usr -Dwerror=true -Dgtk_doc=true -Dpolkit=strict -Dsystemdsystemunitdir=/lib/systemd/system -Dbuiltin_plugins=true
- meson test -C build
- meson install -C build
- ninja -C build
- ninja -C build test
- ninja -C build install
- ninja -C build uninstall