From 1460572b662b95b5946b3542c41da5ce292f6f5b Mon Sep 17 00:00:00 2001
From: Erik Skultety <eskultet@redhat.com>
Date: Thu, 24 Aug 2023 15:49:19 +0200
Subject: [PATCH] ci: build.sh: Drop direct invocation of meson/ninja commands
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 ci/build.sh | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

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" "$*"