From: Erik Skultety <eskultet@redhat.com>
Date: Thu, 24 Aug 2023 13:49:19 +0000 (+0200)
Subject: ci: build.sh: Drop direct invocation of meson/ninja commands
X-Git-Tag: v9.8.0-rc1~124
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1460572b662b95b5946b3542c41da5ce292f6f5b;p=thirdparty%2Flibvirt.git

ci: build.sh: Drop direct invocation of meson/ninja commands

We've moved all invocations to the respective helper function which
we'll execute both from gitlab CI jobs and local environments so we
don't need to have them on the global level as it would also not work
with "sourcing" this file to populate the environment with function
definitions.

Signed-off-by: Erik Skultety <eskultet@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
---

diff --git a/ci/build.sh b/ci/build.sh
index 4776c92bc7..61e2772b69 100644
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -21,10 +21,7 @@ GIT_ROOT="$(git rev-parse --show-toplevel)"
 # $MESON_ARGS correspond to meson's setup args, i.e. configure args. It's
 # populated from a GitLab's job configuration
 
-meson setup build --werror -Dsystem=true $MESON_OPTS $MESON_ARGS || \
-(cat build/meson-logs/meson-log.txt && exit 1)
-
-ninja -C build $NINJA_ARGS
+MESON_ARGS="$MESON_ARGS $MESON_OPTS"
 
 run_cmd() {
     printf "\e[32m[RUN COMMAND]: '%s'\e[0m\n" "$*"