ci: Call meson consistently

We should always pass --werror and display the contents of the
log file in case of failure.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cbc1292839db1f7a8bc6452a7b3271180b1afffb..8b7df68f47d56a231891382e97bf4661b5ceb2ac 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -529,7 +529,7 @@ website:
   before_script:
     - *script_variables
   script:
-    - meson build --prefix=$(pwd)/vroot || (cat build/meson-logs/meson-log.txt && exit 1)
+    - meson 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
   artifacts:
@@ -549,7 +549,7 @@ codestyle:
   before_script:
     - *script_variables
   script:
-    - meson build || (cat build/meson-logs/meson-log.txt && exit 1)
+    - meson build --werror || (cat build/meson-logs/meson-log.txt && exit 1)
     - ninja -C build libvirt-pot-dep
     - meson test -C build --suite syntax-check --no-rebuild || (cat build/meson-logs/testlog.txt && exit 1)
 
@@ -567,7 +567,7 @@ potfile:
   before_script:
     - *script_variables
   script:
-    - meson build || (cat build/meson-logs/meson-log.txt && exit 1)
+    - meson build --werror || (cat build/meson-logs/meson-log.txt && exit 1)
     - ninja -C build libvirt-pot-dep
     - ninja -C build libvirt-pot
     - cp po/libvirt.pot libvirt.pot
@@ -605,7 +605,7 @@ coverity:
   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
     - tar xfz /tmp/cov-analysis-linux64.tgz
-    - meson build
+    - meson build --werror || (cat build/meson-logs/meson-log.txt && exit 1)
     - cov-analysis-linux64-*/bin/cov-build --dir cov-int ninja -C build
     - 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"