openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

gitlab: run "meson" directly instead of "ninja" indirection 

The "dist" and "test" targets in ninja end up calling back into
the equivalent meson commands. The meson commands support various
arguments that are not accessible when invoked via ninja, so it
is preferrable to use meson directly.

Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2021-05-10 18:20:30 +01:00
parent 9cbcea448a
commit b56e2be68e
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
.gitlab-ci.yml
View File

@ -60,8 +60,8 @@ stages:
before_script: before_script:
- *script_variables - *script_variables
script: script:
- meson 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 dist; - meson dist -C build
- if test -x /usr/bin/rpmbuild && test "$RPM" != "skip"; - if test -x /usr/bin/rpmbuild && test "$RPM" != "skip";
then then
rpmbuild --nodeps -ta build/meson-dist/libvirt-*.tar.xz; rpmbuild --nodeps -ta build/meson-dist/libvirt-*.tar.xz;
@ -122,9 +122,9 @@ stages:
before_script: before_script:
- *script_variables - *script_variables
script: script:
- meson build --werror $MESON_OPTS || (cat build/meson-logs/meson-log.txt && exit 1) - meson setup build --werror $MESON_OPTS || (cat build/meson-logs/meson-log.txt && exit 1)
- ninja -C build - meson compile -C build
- if test "$CROSS" = "i686" ; then ninja -C build test ; fi - if test "$CROSS" = "i686" ; then meson test -C build --print-errorlogs ; fi
# Native container build jobs # Native container build jobs
@ -527,7 +527,7 @@ website:
before_script: before_script:
- *script_variables - *script_variables
script: script:
- meson build --werror --prefix=$(pwd)/vroot || (cat build/meson-logs/meson-log.txt && exit 1) - meson setup build --werror --prefix=$(pwd)/vroot || (cat build/meson-logs/meson-log.txt && exit 1)
- ninja -C build install-web - ninja -C build install-web
- mv vroot/share/doc/libvirt/html/ website - mv vroot/share/doc/libvirt/html/ website
artifacts: artifacts:
@ -547,7 +547,7 @@ codestyle:
before_script: before_script:
- *script_variables - *script_variables
script: script:
- meson 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 - ninja -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
@ -565,7 +565,7 @@ potfile:
before_script: before_script:
- *script_variables - *script_variables
script: script:
- meson 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 - ninja -C build libvirt-pot-dep
- ninja -C build libvirt-pot - ninja -C build libvirt-pot
- cp po/libvirt.pot libvirt.pot - cp po/libvirt.pot libvirt.pot
@ -603,8 +603,8 @@ coverity:
script: script:
- curl https://scan.coverity.com/download/linux64 --form project=$COVERITY_SCAN_PROJECT_NAME --form token=$COVERITY_SCAN_TOKEN -o /tmp/cov-analysis-linux64.tgz - curl https://scan.coverity.com/download/linux64 --form project=$COVERITY_SCAN_PROJECT_NAME --form token=$COVERITY_SCAN_TOKEN -o /tmp/cov-analysis-linux64.tgz
- tar xfz /tmp/cov-analysis-linux64.tgz - tar xfz /tmp/cov-analysis-linux64.tgz
- meson build --werror || (cat build/meson-logs/meson-log.txt && exit 1) - meson setup build --werror || (cat build/meson-logs/meson-log.txt && exit 1)
- cov-analysis-linux64-*/bin/cov-build --dir cov-int ninja -C build - cov-analysis-linux64-*/bin/cov-build --dir cov-int meson compile -C build
- tar cfz cov-int.tar.gz cov-int - tar cfz cov-int.tar.gz cov-int
- curl https://scan.coverity.com/builds?project=$COVERITY_SCAN_PROJECT_NAME --form token=$COVERITY_SCAN_TOKEN --form email=$GITLAB_USER_EMAIL --form file=@cov-int.tar.gz --form version="$(git describe --tags)" --form description="$(git describe --tags) / $CI_COMMIT_TITLE / $CI_COMMIT_REF_NAME:$CI_PIPELINE_ID" - curl https://scan.coverity.com/builds?project=$COVERITY_SCAN_PROJECT_NAME --form token=$COVERITY_SCAN_TOKEN --form email=$GITLAB_USER_EMAIL --form file=@cov-int.tar.gz --form version="$(git describe --tags)" --form description="$(git describe --tags) / $CI_COMMIT_TITLE / $CI_COMMIT_REF_NAME:$CI_PIPELINE_ID"
rules: rules:

4
ci/cirrus/build.yml
View File

@ -22,5 +22,5 @@ build_task:
- git fetch origin "$CI_COMMIT_REF_NAME" - git fetch origin "$CI_COMMIT_REF_NAME"
- git reset --hard "$CI_COMMIT_SHA" - git reset --hard "$CI_COMMIT_SHA"
build_script: build_script:
- meson build - meson setup build
- ninja -C build dist - meson dist -C build