[libvirt PATCH v2 18/35] .gitlab-ci.yml: Convert the native 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>
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;
       fi
   after_script:
     - test "$CI_JOB_STATUS" != "success" && exit 1;
-- 
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