External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-12 15:52:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

gitlab-ci.yml: Replace all explicit calls to ninja with meson commands

Browse Source 
This is continuation of what commit b56e2be68e3 started. If we stick to
only calling meson commands directly, we can achieve much better
consistency in passing arguments to meson especially if we unify the
recipes run in gitlab CI and what we can currently run locally in
containers using docker/podman.

Signed-off-by: Erik Skultety <eskultet@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Erik Skultety 2023-01-27 11:12:06 +01:00
parent 4e381c3e1d
commit 99cc3f7aa9
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.gitlab-ci.yml
View File

@ -76,7 +76,7 @@ include:
script: script:
- *script_variables - *script_variables
- meson setup build --werror -Dsystem=true || (cat build/meson-logs/meson-log.txt && exit 1) - meson setup build --werror -Dsystem=true || (cat build/meson-logs/meson-log.txt && exit 1)
- DESTDIR=$(pwd)/install ninja -C build install-web - DESTDIR=$(pwd)/install meson compile -C build install-web
- mv install/usr/share/doc/libvirt/html/ website - mv install/usr/share/doc/libvirt/html/ website
artifacts: artifacts:
expose_as: 'Website' expose_as: 'Website'
@ -110,7 +110,7 @@ website_local_env:
script: script:
- *script_variables - *script_variables
- meson setup build --werror || (cat build/meson-logs/meson-log.txt && exit 1) - meson setup build --werror || (cat build/meson-logs/meson-log.txt && exit 1)
- ninja -C build libvirt-pot-dep - meson compile -C build libvirt-pot-dep
- meson test -C build --suite syntax-check --no-rebuild --print-errorlogs - meson test -C build --suite syntax-check --no-rebuild --print-errorlogs
codestyle_prebuilt_env: codestyle_prebuilt_env:
@ -153,9 +153,8 @@ potfile:
- *script_variables - *script_variables
script: script:
- meson setup build --werror || (cat build/meson-logs/meson-log.txt && exit 1) - meson setup build --werror || (cat build/meson-logs/meson-log.txt && exit 1)
- ninja -C build libvirt-pot-dep - meson compile -C build libvirt-pot-dep
- ninja -C build libvirt-pot - meson compile -C build libvirt-pot
- ninja -C build libvirt-pot-check
- cp po/libvirt.pot libvirt.pot - cp po/libvirt.pot libvirt.pot
artifacts: artifacts:
expose_as: 'Potfile' expose_as: 'Potfile'