From ffdb0a84b862fbdb8045ed1d4f7fd6ab17916b91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Thu, 2 Jul 2026 18:31:11 +0200 Subject: [PATCH] ci/build: Use meson compile rather than ninja --- .ci/check-abi | 4 ++-- .gitlab-ci.yml | 2 +- data/meson.build | 2 +- tests/test-generated-hwdb.sh | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.ci/check-abi b/.ci/check-abi index 06eb1aca..eca3936e 100755 --- a/.ci/check-abi +++ b/.ci/check-abi @@ -68,8 +68,8 @@ def build_install(revision): subprocess.check_call(['meson', build_dir, '--prefix=/usr', '--libdir=lib', '-Dx11-examples=false', '-Ddoc=false', '-Dgtk-examples=false']) - subprocess.check_call(['ninja', '-v', '-C', build_dir]) - subprocess.check_call(['ninja', '-v', '-C', build_dir, 'install'], + subprocess.check_call(['meson', 'compile', '-v', '-C', build_dir]) + subprocess.check_call(['meson', 'install', '-v', '-C', build_dir], env={'DESTDIR': dest_dir}) return dest_dir diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c9ae4cd3..52ed0464 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -90,7 +90,7 @@ test: script: - meson setup _build --werror -Ddrivers=all -Db_coverage=true - meson test -C _build --print-errorlogs --no-stdsplit --timeout-multiplier 3 - - ninja -C _build coverage || true + - meson compile -C _build coverage || true - cat _build/meson-logs/coverage.txt || true artifacts: reports: diff --git a/data/meson.build b/data/meson.build index 6f57fca9..279ae006 100644 --- a/data/meson.build +++ b/data/meson.build @@ -1,6 +1,6 @@ if udev_hwdb_dir != '' # This file has to be updated using - # ninja -C libfprint/sync-udev-hwdb + # meson compile -C sync-udev-hwdb # Note that the unsupported device list needs to be manually synced from # the wiki. See comment in libfprint/fprint-list-uev-hwdb.c diff --git a/tests/test-generated-hwdb.sh b/tests/test-generated-hwdb.sh index b1031802..827bcc1f 100755 --- a/tests/test-generated-hwdb.sh +++ b/tests/test-generated-hwdb.sh @@ -23,7 +23,7 @@ fi if ! diff -u "$MESON_SOURCE_ROOT/data/autosuspend.hwdb" "$generated_rules"; then echo "E: Autosuspend file needs to be re-generated!" - echo " ninja -C $MESON_BUILD_ROOT sync-udev-hwdb" + echo " meson compile -C $MESON_BUILD_ROOT sync-udev-hwdb" exit 1 fi