Re: [libvirt PATCH 05/20] ci: build.sh: Use 'meson setup' explicitly
On Mon, Feb 06, 2023 at 02:53:02PM +0100, Erik Skultety wrote:
Even though 'setup' is assumed when no other command is
given, we're
being explicit in our GitLab recipes, so do the same for the local
build.sh script too.
It is actually gouing to become mandatory soon based
on the warnings shown in recent meson
WARNING: Running the setup command as `meson [options]` instead of `meson setup [options]`
is ambiguous and deprecated.
so if there are any other places across projects with this
old syntax we'll need to flush them out too.
Signed-off-by: Erik Skultety <eskultet(a)redhat.com>
---
ci/build.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Reviewed-by: Daniel P. Berrangé <berrange(a)redhat.com>
diff --git a/ci/build.sh b/ci/build.sh
index 3fa28eafa8..c7cba6ffa8 100644
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -8,7 +8,7 @@ export VIR_TEST_DEBUG=1
# populated at build time from the Dockerfile. A typical use case would
# be to pass options to trigger cross-compilation
-meson build --werror $MESON_OPTS $CI_MESON_ARGS || \
+meson setup build --werror $MESON_OPTS $CI_MESON_ARGS || \
(cat build/meson-logs/meson-log.txt && exit 1)
ninja -C build $CI_NINJA_ARGS
--
2.39.1
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 :|