ci/build: Use meson compile rather than ninja

This commit is contained in:
Marco Trevisan (Treviño)
2026-07-24 10:44:26 +00:00
committed by Marco Trevisan
parent 1b9bee4b6d
commit ffdb0a84b8
4 changed files with 5 additions and 5 deletions
+2 -2
View File
@@ -68,8 +68,8 @@ def build_install(revision):
subprocess.check_call(['meson', build_dir, subprocess.check_call(['meson', build_dir,
'--prefix=/usr', '--libdir=lib', '--prefix=/usr', '--libdir=lib',
'-Dx11-examples=false', '-Ddoc=false', '-Dgtk-examples=false']) '-Dx11-examples=false', '-Ddoc=false', '-Dgtk-examples=false'])
subprocess.check_call(['ninja', '-v', '-C', build_dir]) subprocess.check_call(['meson', 'compile', '-v', '-C', build_dir])
subprocess.check_call(['ninja', '-v', '-C', build_dir, 'install'], subprocess.check_call(['meson', 'install', '-v', '-C', build_dir],
env={'DESTDIR': dest_dir}) env={'DESTDIR': dest_dir})
return dest_dir return dest_dir
+1 -1
View File
@@ -90,7 +90,7 @@ test:
script: script:
- meson setup _build --werror -Ddrivers=all -Db_coverage=true - meson setup _build --werror -Ddrivers=all -Db_coverage=true
- meson test -C _build --print-errorlogs --no-stdsplit --timeout-multiplier 3 - 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 - cat _build/meson-logs/coverage.txt || true
artifacts: artifacts:
reports: reports:
+1 -1
View File
@@ -1,6 +1,6 @@
if udev_hwdb_dir != '' if udev_hwdb_dir != ''
# This file has to be updated using # This file has to be updated using
# ninja -C <builddir> libfprint/sync-udev-hwdb # meson compile -C <builddir> sync-udev-hwdb
# Note that the unsupported device list needs to be manually synced from # Note that the unsupported device list needs to be manually synced from
# the wiki. See comment in libfprint/fprint-list-uev-hwdb.c # the wiki. See comment in libfprint/fprint-list-uev-hwdb.c
+1 -1
View File
@@ -23,7 +23,7 @@ fi
if ! diff -u "$MESON_SOURCE_ROOT/data/autosuspend.hwdb" "$generated_rules"; then if ! diff -u "$MESON_SOURCE_ROOT/data/autosuspend.hwdb" "$generated_rules"; then
echo "E: Autosuspend file needs to be re-generated!" 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 exit 1
fi fi