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 <eskultet@redhat.com>
---
 .gitlab-ci.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1b72ebc493..699be460ca 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,8 +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
+    - meson compile -C build libvirt-pot-dep
+    - meson compile -C build libvirt-pot
     - cp po/libvirt.pot libvirt.pot
   artifacts:
     expose_as: 'Potfile'
-- 
2.39.1

On Mon, Feb 06, 2023 at 02:52:58PM +0100, Erik Skultety wrote:
> 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 <eskultet@redhat.com>
> ---
>  .gitlab-ci.yml | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>


With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|