[libvirt PATCH 18/33] .gitlab-ci.yml: Convert the cross build job to the build.sh usage

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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>
---
 .gitlab-ci.yml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6a8115037d..b59e56941c 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/build.sh
+    - run_build
+    - if test "$CROSS" = "i686" ;
+      then
+        run_test;
+      fi
 
 .cross_build_job_prebuilt_env:
   extends:
-- 
2.41.0




[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]

  Powered by Linux