From: Paolo Bonzini <pbonzini@redhat.com>
Date: Thu, 31 Oct 2024 14:09:52 +0000 (+0100)
Subject: ci: always invoke meson through pyvenv
X-Git-Tag: v9.2.0-rc0~27^2~22
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cf4344639bbedb3f941488af75f44da9aa3d8650;p=thirdparty%2Fqemu.git

ci: always invoke meson through pyvenv

Do not assume that the distro-installed meson is compatible with the one
in the virtual environment.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/.gitlab-ci.d/buildtest-template.yml b/.gitlab-ci.d/buildtest-template.yml
index 8c69c60d215..39da7698b09 100644
--- a/.gitlab-ci.d/buildtest-template.yml
+++ b/.gitlab-ci.d/buildtest-template.yml
@@ -66,7 +66,7 @@
     - source scripts/ci/gitlab-ci-section
     - section_start buildenv "Setting up to run tests"
     - scripts/git-submodule.sh update roms/SLOF
-    - meson subprojects download $(cd build/subprojects && echo *)
+    - build/pyvenv/bin/meson subprojects download $(cd build/subprojects && echo *)
     - cd build
     - find . -type f -exec touch {} +
     # Avoid recompiling by hiding ninja with NINJA=":"