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, 6 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c837812091..f4c5b47f15 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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:
--
2.41.0
