From: Erik Skultety <eskultet@redhat.com>
Date: Thu, 24 Aug 2023 14:05:41 +0000 (+0200)
Subject: .gitlab-ci.yml: Convert the cross build job to the build.sh usage
X-Git-Tag: v9.8.0-rc1~119
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8a2866a4f67ba8b3b9f4dde24f002418d5c1ed01;p=thirdparty%2Flibvirt.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>
---

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: