]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
ci: Fix paths shown in the website
authorAndrea Bolognani <abologna@redhat.com>
Tue, 19 Jul 2022 13:21:30 +0000 (15:21 +0200)
committerAndrea Bolognani <abologna@redhat.com>
Thu, 11 Aug 2022 12:02:00 +0000 (14:02 +0200)
Right now we're setting the prefix to a custom path, which
results in paths like

  /builds/libvirt/libvirt/vroot/etc/libvirt/virtqemud.conf

ending up in the generated HTML. In order to avoid that,
set the prefix and other installation paths to reasonable
default values by passing

  -Dsystem=true

and then take advantage of $DESTDIR support to still be able
to write the HTML files without requiring root privileges.

Reported-by: Martin Kletzander <mkletzan@redhat.com>
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
.gitlab-ci.yml

index 39c5f8fb6df788daa25613b341f49e50c7a27479..f6ed14bf653ddcf531b096cf0a93df72270f7d61 100644 (file)
@@ -67,9 +67,9 @@ website:
   before_script:
     - *script_variables
   script:
-    - meson setup build --werror --prefix=$(pwd)/vroot || (cat build/meson-logs/meson-log.txt && exit 1)
-    - ninja -C build install-web
-    - mv vroot/share/doc/libvirt/html/ website
+    - meson setup build --werror -Dsystem=true || (cat build/meson-logs/meson-log.txt && exit 1)
+    - DESTDIR=$(pwd)/install ninja -C build install-web
+    - mv install/usr/share/doc/libvirt/html/ website
   artifacts:
     expose_as: 'Website'
     name: 'website'