diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2021-03-25 13:06:13 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2021-05-26 14:50:05 +0200 |
| commit | 7cf333a37260c4aafa465453adc8e073e408967e (patch) | |
| tree | 7ba8bb8ddf3ab720dd6852efcd9b9e6fbedd9b1f | |
| parent | b802d14dc6f3fba988baa9804af8f4cf837c6886 (diff) | |
| download | focaccia-qemu-7cf333a37260c4aafa465453adc8e073e408967e.tar.gz focaccia-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>
| -rw-r--r-- | .gitlab-ci.yml | 4 |
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 |