summaryrefslogtreecommitdiffstats
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorPaolo Bonzini2021-03-25 13:06:13 +0100
committerPaolo Bonzini2021-05-26 14:50:05 +0200
commit7cf333a37260c4aafa465453adc8e073e408967e (patch)
tree7ba8bb8ddf3ab720dd6852efcd9b9e6fbedd9b1f /.gitlab-ci.yml
parenthw/scsi: Fix sector translation bug in scsi_unmap_complete_noio (diff)
downloadqemu-7cf333a37260c4aafa465453adc8e073e408967e.tar.gz
qemu-7cf333a37260c4aafa465453adc8e073e408967e.tar.xz
qemu-7cf333a37260c4aafa465453adc8e073e408967e.zip
gitlab-ci: use --meson=git for CFI jobs
Ensure that the meson submodule is checked out by the check targets, as they will need it to run "meson test". Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f718b61fa7..a6290d43bc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,9 +27,9 @@ include:
- cd build
- if test -n "$TARGETS";
then
- ../configure --enable-werror --disable-docs ${LD_JOBS:+--meson=internal} $CONFIGURE_ARGS --target-list="$TARGETS" ;
+ ../configure --enable-werror --disable-docs ${LD_JOBS:+--meson=git} $CONFIGURE_ARGS --target-list="$TARGETS" ;
else
- ../configure --enable-werror --disable-docs ${LD_JOBS:+--meson=internal} $CONFIGURE_ARGS ;
+ ../configure --enable-werror --disable-docs ${LD_JOBS:+--meson=git} $CONFIGURE_ARGS ;
fi || { cat config.log meson-logs/meson-log.txt && exit 1; }
- if test -n "$LD_JOBS";
then