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

diff --git a/ci/build.sh b/ci/build.sh
index 133952f706..b075c49af3 100644
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -18,11 +18,6 @@ GIT_ROOT="$(git rev-parse --show-toplevel)"
 
 MESON_ARGS="$MESON_ARGS $MESON_OPTS"
 
-meson setup build --werror -Dsystem=true $MESON_ARGS || \
-(cat build/meson-logs/meson-log.txt && exit 1)
-
-ninja -C build $NINJA_ARGS
-
 run_cmd() {
     local CMD="$(echo $CMD | tr -s ' ')" # truncate any additional spaces
 
-- 
2.41.0

On Fri, Aug 25, 2023 at 07:55:22PM +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>
> ---
>  ci/build.sh | 5 -----
>  1 file changed, 5 deletions(-)
> 
> diff --git a/ci/build.sh b/ci/build.sh
> index 133952f706..b075c49af3 100644
> --- a/ci/build.sh
> +++ b/ci/build.sh
> @@ -18,11 +18,6 @@ GIT_ROOT="$(git rev-parse --show-toplevel)"
>  
>  MESON_ARGS="$MESON_ARGS $MESON_OPTS"
>  
> -meson setup build --werror -Dsystem=true $MESON_ARGS || \
> -(cat build/meson-logs/meson-log.txt && exit 1)
> -
> -ninja -C build $NINJA_ARGS
> -
>  run_cmd() {
>      local CMD="$(echo $CMD | tr -s ' ')" # truncate any additional spaces
>

Now we drop immediate invokation at time of execution, I wonder if the
build.sh name is a little mis-leading.

Might be better renamed to 'functions.sh' or 'commands.sh' perhaps, so
the name doesn't suggest that it actually builds stuff, merely that it
supplies some shell logic ?


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 :|

On Thu, Aug 31, 2023 at 05:59:26PM +0100, Daniel P. Berrangé wrote:
> On Fri, Aug 25, 2023 at 07:55:22PM +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>
> > ---
> >  ci/build.sh | 5 -----
> >  1 file changed, 5 deletions(-)
> > 
> > diff --git a/ci/build.sh b/ci/build.sh
> > index 133952f706..b075c49af3 100644
> > --- a/ci/build.sh
> > +++ b/ci/build.sh
> > @@ -18,11 +18,6 @@ GIT_ROOT="$(git rev-parse --show-toplevel)"
> >  
> >  MESON_ARGS="$MESON_ARGS $MESON_OPTS"
> >  
> > -meson setup build --werror -Dsystem=true $MESON_ARGS || \
> > -(cat build/meson-logs/meson-log.txt && exit 1)
> > -
> > -ninja -C build $NINJA_ARGS
> > -
> >  run_cmd() {
> >      local CMD="$(echo $CMD | tr -s ' ')" # truncate any additional spaces
> >
> 
> Now we drop immediate invokation at time of execution, I wonder if the
> build.sh name is a little mis-leading.
> 
> Might be better renamed to 'functions.sh' or 'commands.sh' perhaps, so
> the name doesn't suggest that it actually builds stuff, merely that it
> supplies some shell logic ?

Fair enough, didn't like the name either, but I wanted to keep at least
something we had around :).

Erik