openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Erik Skultety 2023-08-24 15:49:19 +02:00
parent 56b37fe381
commit 1460572b66
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ci/build.sh
View File

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