]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
.gitlab-ci.yml: Convert the website build job to the build.sh usage
authorErik Skultety <eskultet@redhat.com>
Thu, 24 Aug 2023 14:05:41 +0000 (16:05 +0200)
committerErik Skultety <eskultet@redhat.com>
Tue, 12 Sep 2023 09:36:03 +0000 (11:36 +0200)
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>
.gitlab-ci.yml

index f4c5b47f15406082236baca61c7c5c460b4bb299..d41cc63ec2fe8c41aff78fd75502415f8e1fa138 100644 (file)
@@ -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