[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 10/10] gitlab-ci: use --meson=internal for CFI jobs
From: |
Paolo Bonzini |
Subject: |
[PULL 10/10] gitlab-ci: use --meson=internal for CFI jobs |
Date: |
Sat, 1 May 2021 11:30:26 +0200 |
If we use the system Meson but it is too old, the subsequent "meson configure"
will fail. Always use the submodule when building with CFI.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
.gitlab-ci.yml | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 52d65d6c04..dcb6317aac 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,17 +19,21 @@ include:
before_script:
- JOBS=$(expr $(nproc) + 1)
script:
+ - if test -n "$LD_JOBS";
+ then
+ scripts/git-submodule.sh update meson ;
+ fi
- mkdir build
- cd build
- if test -n "$TARGETS";
then
- ../configure --enable-werror --disable-docs $CONFIGURE_ARGS
--target-list="$TARGETS" ;
+ ../configure --enable-werror --disable-docs
${LD_JOBS:+--meson=internal} $CONFIGURE_ARGS --target-list="$TARGETS" ;
else
- ../configure --enable-werror --disable-docs $CONFIGURE_ARGS ;
+ ../configure --enable-werror --disable-docs
${LD_JOBS:+--meson=internal} $CONFIGURE_ARGS ;
fi || { cat config.log meson-logs/meson-log.txt && exit 1; }
- if test -n "$LD_JOBS";
then
- meson configure . -Dbackend_max_links="$LD_JOBS" ;
+ ../meson/meson.py configure . -Dbackend_max_links="$LD_JOBS" ;
fi || exit 1;
- make -j"$JOBS"
- if test -n "$MAKE_CHECK_ARGS";
--
2.31.1
- [PULL 00/10] Misc patches for 2021-04-30 (incl. NVMM accelerator), Paolo Bonzini, 2021/05/01
- [PULL 02/10] Add NVMM accelerator: configure and build logic, Paolo Bonzini, 2021/05/01
- [PULL 06/10] ratelimit: protect with a mutex, Paolo Bonzini, 2021/05/01
- [PULL 10/10] gitlab-ci: use --meson=internal for CFI jobs,
Paolo Bonzini <=
- [PULL 01/10] oslib-win32: do not rely on macro to get redefined function name, Paolo Bonzini, 2021/05/01
- [PULL 07/10] slirp: add configure option to disable smbd, Paolo Bonzini, 2021/05/01
- [PULL 03/10] Add NVMM accelerator: x86 CPU support, Paolo Bonzini, 2021/05/01
- [PULL 08/10] configure: reindent meson invocation, Paolo Bonzini, 2021/05/01
- [PULL 05/10] Add NVMM Accelerator: add maintainers for NetBSD/NVMM, Paolo Bonzini, 2021/05/01
- [PULL 04/10] Add NVMM accelerator: acceleration enlightenments, Paolo Bonzini, 2021/05/01
- [PULL 09/10] configure: handle meson options that have changed type, Paolo Bonzini, 2021/05/01
- Re: [PULL 00/10] Misc patches for 2021-04-30 (incl. NVMM accelerator), Peter Maydell, 2021/05/01