From 99cc3f7aa928abb86f51f6efbaa6ba976ddd30af Mon Sep 17 00:00:00 2001 From: Erik Skultety Date: Fri, 27 Jan 2023 11:12:06 +0100 Subject: [PATCH] gitlab-ci.yml: Replace all explicit calls to ninja with meson commands MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is continuation of what commit b56e2be68e3 started. If we stick to only calling meson commands directly, we can achieve much better consistency in passing arguments to meson especially if we unify the recipes run in gitlab CI and what we can currently run locally in containers using docker/podman. Signed-off-by: Erik Skultety Reviewed-by: Daniel P. Berrangé --- .gitlab-ci.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2378b1a39f..188de53652 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -76,7 +76,7 @@ include: script: - *script_variables - meson setup build --werror -Dsystem=true || (cat build/meson-logs/meson-log.txt && exit 1) - - DESTDIR=$(pwd)/install ninja -C build install-web + - DESTDIR=$(pwd)/install meson compile -C build install-web - mv install/usr/share/doc/libvirt/html/ website artifacts: expose_as: 'Website' @@ -110,7 +110,7 @@ website_local_env: script: - *script_variables - meson setup build --werror || (cat build/meson-logs/meson-log.txt && exit 1) - - ninja -C build libvirt-pot-dep + - meson compile -C build libvirt-pot-dep - meson test -C build --suite syntax-check --no-rebuild --print-errorlogs codestyle_prebuilt_env: @@ -153,9 +153,8 @@ potfile: - *script_variables script: - meson setup build --werror || (cat build/meson-logs/meson-log.txt && exit 1) - - ninja -C build libvirt-pot-dep - - ninja -C build libvirt-pot - - ninja -C build libvirt-pot-check + - meson compile -C build libvirt-pot-dep + - meson compile -C build libvirt-pot - cp po/libvirt.pot libvirt.pot artifacts: expose_as: 'Potfile'