mirror of https://gitee.com/openkylin/libvirt.git
.gitlab-ci.yml: Convert the cross build job to the build.sh usage
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@redhat.com> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
parent
f688a53a3e
commit
8a2866a4f6
|
@ -56,10 +56,12 @@ include:
|
|||
- ccache/
|
||||
key: "$CI_JOB_NAME"
|
||||
script:
|
||||
- *script_variables
|
||||
- meson setup build --werror $MESON_OPTS || (cat build/meson-logs/meson-log.txt && exit 1)
|
||||
- meson compile -C build
|
||||
- if test "$CROSS" = "i686" ; then meson test -C build --no-suite syntax-check --print-errorlogs ; fi
|
||||
- source ci/jobs.sh
|
||||
- run_build
|
||||
- if test "$CROSS" = "i686" ;
|
||||
then
|
||||
run_test;
|
||||
fi
|
||||
|
||||
.cross_build_job_prebuilt_env:
|
||||
extends:
|
||||
|
|
Loading…
Reference in New Issue