[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 22/22] gitlab: default to not building the documentation
From: |
Alex Bennée |
Subject: |
[PATCH v2 22/22] gitlab: default to not building the documentation |
Date: |
Tue, 23 Mar 2021 16:53:08 +0000 |
In d0f26e68a0 ("gitlab: force enable docs build in Fedora, Ubuntu,
Debian") we made sure we can build the documents on more than one
system. However we don't want to build documents all the time as it's
a waste of cycles (and energy). So lets reduce the total amount of
documentation we build while still keeping coverage of at least one
build on each supported target.
Fixes: a8a3abe0b3 ("gitlab: move docs and tools build across from Travis")
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
v2
- enable for OpenSUSE LEAP and Centos8 as well
- disable for all cross builds
- minor re-word of the commit text
v3
- revert: enable for OpenSUSE LEAP and Centos8 as well
---
.gitlab-ci.d/crossbuilds.yml | 15 ++++++++-------
.gitlab-ci.yml | 10 +++++-----
2 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml
index d5098c986b..2d95784ed5 100644
--- a/.gitlab-ci.d/crossbuilds.yml
+++ b/.gitlab-ci.d/crossbuilds.yml
@@ -6,10 +6,10 @@
- mkdir build
- cd build
- PKG_CONFIG_PATH=$PKG_CONFIG_PATH
- ../configure --enable-werror $QEMU_CONFIGURE_OPTS --disable-user
- --target-list-exclude="arm-softmmu cris-softmmu i386-softmmu
- microblaze-softmmu mips-softmmu mipsel-softmmu mips64-softmmu
- ppc-softmmu sh4-softmmu xtensa-softmmu"
+ ../configure --enable-werror --disable-docs $QEMU_CONFIGURE_OPTS
+ --disable-user --target-list-exclude="arm-softmmu cris-softmmu
+ i386-softmmu microblaze-softmmu mips-softmmu mipsel-softmmu
+ mips64-softmmu ppc-softmmu sh4-softmmu xtensa-softmmu"
- make -j$(expr $(nproc) + 1) all check-build $MAKE_CHECK_ARGS
# Job to cross-build specific accelerators.
@@ -25,8 +25,8 @@
- mkdir build
- cd build
- PKG_CONFIG_PATH=$PKG_CONFIG_PATH
- ../configure --enable-werror $QEMU_CONFIGURE_OPTS --disable-tools
- --enable-${ACCEL:-kvm} $ACCEL_CONFIGURE_OPTS
+ ../configure --enable-werror --disable-docs $QEMU_CONFIGURE_OPTS
+ --disable-tools --enable-${ACCEL:-kvm} $ACCEL_CONFIGURE_OPTS
- make -j$(expr $(nproc) + 1) all check-build
.cross_user_build_job:
@@ -36,7 +36,8 @@
- mkdir build
- cd build
- PKG_CONFIG_PATH=$PKG_CONFIG_PATH
- ../configure --enable-werror $QEMU_CONFIGURE_OPTS --disable-system
+ ../configure --enable-werror --disable-docs $QEMU_CONFIGURE_OPTS
+ --disable-system
- make -j$(expr $(nproc) + 1) all check-build $MAKE_CHECK_ARGS
cross-armel-system:
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9ffbaa7ffb..3480d79db3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,9 +23,9 @@ include:
- cd build
- if test -n "$TARGETS";
then
- ../configure --enable-werror $CONFIGURE_ARGS --target-list="$TARGETS" ;
+ ../configure --enable-werror --disable-docs $CONFIGURE_ARGS
--target-list="$TARGETS" ;
else
- ../configure --enable-werror $CONFIGURE_ARGS ;
+ ../configure --enable-werror --disable-docs $CONFIGURE_ARGS ;
fi || { cat config.log meson-logs/meson-log.txt && exit 1; }
- if test -n "$LD_JOBS";
then
@@ -119,7 +119,7 @@ build-system-ubuntu:
job: amd64-ubuntu2004-container
variables:
IMAGE: ubuntu2004
- CONFIGURE_ARGS: --enable-fdt=system --enable-slirp=system
+ CONFIGURE_ARGS: --enable-docs --enable-fdt=system --enable-slirp=system
TARGETS: aarch64-softmmu alpha-softmmu cris-softmmu hppa-softmmu
moxie-softmmu microblazeel-softmmu mips64el-softmmu
MAKE_CHECK_ARGS: check-build
@@ -607,7 +607,7 @@ tsan-build:
job: amd64-ubuntu2004-container
variables:
IMAGE: ubuntu2004
- CONFIGURE_ARGS: --enable-tsan --cc=clang-10 --cxx=clang++-10 --disable-docs
+ CONFIGURE_ARGS: --enable-tsan --cc=clang-10 --cxx=clang++-10
--enable-trace-backends=ust --enable-fdt=system --enable-slirp=system
TARGETS: x86_64-softmmu ppc64-softmmu riscv64-softmmu x86_64-linux-user
MAKE_CHECK_ARGS: bench V=1
@@ -619,7 +619,7 @@ build-deprecated:
job: amd64-debian-user-cross-container
variables:
IMAGE: debian-all-test-cross
- CONFIGURE_ARGS: --disable-docs --disable-tools
+ CONFIGURE_ARGS: --disable-tools
MAKE_CHECK_ARGS: build-tcg
TARGETS: ppc64abi32-linux-user lm32-softmmu unicore32-softmmu
artifacts:
--
2.20.1
- [PATCH v2 12/22] cirrus.yml: Update the FreeBSD task to version 12.2, (continued)
- [PATCH v2 12/22] cirrus.yml: Update the FreeBSD task to version 12.2, Alex Bennée, 2021/03/23
- [PATCH v2 09/22] tests/tcg: add HeapInfo checking to semihosting test, Alex Bennée, 2021/03/23
- [PATCH v2 11/22] configure: Don't use the __atomic_*_16 functions for testing 128-bit support, Alex Bennée, 2021/03/23
- [PATCH v2 10/22] gitlab-ci.yml: Merge the trace-backend testing into other jobs, Alex Bennée, 2021/03/23
- [PATCH v2 14/22] utils: Work around mingw strto*l bug with 0x, Alex Bennée, 2021/03/23
- [PATCH v2 21/22] iotests: iothreads need ioeventfd, Alex Bennée, 2021/03/23
- [PATCH v2 17/22] m68k: add the virtio devices aliases, Alex Bennée, 2021/03/23
- [PATCH v2 18/22] blockdev: with -drive if=virtio, use generic virtio-blk, Alex Bennée, 2021/03/23
- [PATCH v2 22/22] gitlab: default to not building the documentation,
Alex Bennée <=
- [PATCH v2 20/22] iotests: test m68k with the virt machine, Alex Bennée, 2021/03/23
- [PATCH v2 15/22] gitlab: extend timeouts for CFI builds, Alex Bennée, 2021/03/23
- [PATCH v2 19/22] iotests: Revert "iotests: use -ccw on s390x for 040, 139, and 182", Alex Bennée, 2021/03/23
- [PATCH v2 16/22] qdev: define list of archs with virtio-pci or virtio-ccw, Alex Bennée, 2021/03/23
- Re: [PATCH for 6.0 v2 00/22] fixes for rc1 pre-PR (kernel-doc, semihosting, testing), no-reply, 2021/03/23
- Re: [PATCH for 6.0 v2 00/22] fixes for rc1 pre-PR (kernel-doc, semihosting, testing), Peter Maydell, 2021/03/24