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>
Erik Skultety <eskultet@redhat.com>:
---
 ci/build.sh | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/ci/build.sh b/ci/build.sh
index fd326dad8d..ac649ed9a9 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" "$*"
-- 
2.41.0

On Mon, Sep 11, 2023 at 03:43:15PM +0200, Erik Skultety wrote:
> 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>
> Erik Skultety <eskultet@redhat.com>:
> ---
>  ci/build.sh | 5 +----
>  1 file changed, 1 insertion(+), 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 :|