On Mon, Sep 11, 2023 at 03:43:19PM +0200, Erik Skultety wrote: > Individual shell command executions are replaced by respective > functions in the ci/build.sh base script. This will make sure we use > the same recipes in GitLab jobs as well as in local executions. > > Signed-off-by: Erik Skultety <eskultet@xxxxxxxxxx> > Reviewed-by: Daniel P. Berrangé <berrange@xxxxxxxxxx> > Erik Skultety <eskultet@xxxxxxxxxx>: > --- > .gitlab-ci.yml | 10 ++++------ > 1 file changed, 4 insertions(+), 6 deletions(-) > > diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml > index 1c6af8f8b3..c837812091 100644 > --- a/.gitlab-ci.yml > +++ b/.gitlab-ci.yml > @@ -25,15 +25,13 @@ include: > - ccache/ > key: "$CI_JOB_NAME" > script: > - - *script_variables > - - meson setup build --werror $MESON_ARGS || (cat build/meson-logs/meson-log.txt && exit 1) > - - meson dist -C build --no-tests > + - source ci/jobs.sh > - if test -x /usr/bin/rpmbuild && test "$RPM" != "skip"; > then > - rpmbuild --clean --nodeps --define "_without_mingw 1" -ta build/meson-dist/libvirt-*.tar.xz; > + run_rpmbuild; > else > - meson compile -C build; > - meson test -C build --no-suite syntax-check --print-errorlogs; > + run_build; > + run_test; I missed a regression here - we're loosing the --no-suite and --print-errorlogs args when running tests, so we can no longer diagnose the failures. > fi > after_script: > - test "$CI_JOB_STATUS" != "success" && exit 1; > -- > 2.41.0 > 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 :|
