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

.gitlab-ci.yml: Convert the website 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 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