[libvirt PATCH v2 20/35] .gitlab-ci.yml: Convert the website 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 | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f4c5b47f15..d41cc63ec2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -79,9 +79,8 @@ include:
 #    https://gitlab.com/libvirt/libvirt/-/jobs/artifacts/master/download?job=website
 .website_job:
   script:
-    - *script_variables
-    - meson setup build --werror -Dsystem=true || (cat build/meson-logs/meson-log.txt && exit 1)
-    - DESTDIR=$(pwd)/install meson compile -C build install-web
+    - source ci/jobs.sh
+    - run_website_build
   after_script:
     - test "$CI_JOB_STATUS" != "success" && exit 1;
     - mv install/usr/share/doc/libvirt/html/ website
-- 
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