haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

gitlab: default to not building the documentation

Browse source 
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>
Message-Id: <20210323165308.15244-23-alex.bennee@linaro.org>
This commit is contained in:
Alex Bennée 2021-03-23 16:53:08 +00:00
parent 359a856270
commit a9eb2df27f
2 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
.gitlab-ci.d/crossbuilds.yml
View file

@ -6,10 +6,10 @@
- mkdir build - mkdir build
- cd build - cd build
- PKG_CONFIG_PATH=$PKG_CONFIG_PATH - PKG_CONFIG_PATH=$PKG_CONFIG_PATH
../configure --enable-werror $QEMU_CONFIGURE_OPTS --disable-user ../configure --enable-werror --disable-docs $QEMU_CONFIGURE_OPTS
--target-list-exclude="arm-softmmu cris-softmmu i386-softmmu --disable-user --target-list-exclude="arm-softmmu cris-softmmu
microblaze-softmmu mips-softmmu mipsel-softmmu mips64-softmmu i386-softmmu microblaze-softmmu mips-softmmu mipsel-softmmu
ppc-softmmu sh4-softmmu xtensa-softmmu" mips64-softmmu ppc-softmmu sh4-softmmu xtensa-softmmu"
- make -j$(expr $(nproc) + 1) all check-build $MAKE_CHECK_ARGS - make -j$(expr $(nproc) + 1) all check-build $MAKE_CHECK_ARGS
# Job to cross-build specific accelerators. # Job to cross-build specific accelerators.
@ -25,8 +25,8 @@
- mkdir build - mkdir build
- cd build - cd build
- PKG_CONFIG_PATH=$PKG_CONFIG_PATH - PKG_CONFIG_PATH=$PKG_CONFIG_PATH
../configure --enable-werror $QEMU_CONFIGURE_OPTS --disable-tools ../configure --enable-werror --disable-docs $QEMU_CONFIGURE_OPTS
--enable-${ACCEL:-kvm} $ACCEL_CONFIGURE_OPTS --disable-tools --enable-${ACCEL:-kvm} $ACCEL_CONFIGURE_OPTS
- make -j$(expr $(nproc) + 1) all check-build - make -j$(expr $(nproc) + 1) all check-build
.cross_user_build_job: .cross_user_build_job:
@ -36,7 +36,8 @@
- mkdir build - mkdir build
- cd build - cd build
- PKG_CONFIG_PATH=$PKG_CONFIG_PATH - 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 - make -j$(expr $(nproc) + 1) all check-build $MAKE_CHECK_ARGS
cross-armel-system: cross-armel-system:

10
.gitlab-ci.yml
View file

@ -23,9 +23,9 @@ include:
- cd build - cd build
- if test -n "$TARGETS"; - if test -n "$TARGETS";
then then
../configure --enable-werror $CONFIGURE_ARGS --target-list="$TARGETS" ; ../configure --enable-werror --disable-docs $CONFIGURE_ARGS --target-list="$TARGETS" ;
else else
../configure --enable-werror $CONFIGURE_ARGS ; ../configure --enable-werror --disable-docs $CONFIGURE_ARGS ;
fi || { cat config.log meson-logs/meson-log.txt && exit 1; } fi || { cat config.log meson-logs/meson-log.txt && exit 1; }
- if test -n "$LD_JOBS"; - if test -n "$LD_JOBS";
then then
@ -119,7 +119,7 @@ build-system-ubuntu:
job: amd64-ubuntu2004-container job: amd64-ubuntu2004-container
variables: variables:
IMAGE: ubuntu2004 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 TARGETS: aarch64-softmmu alpha-softmmu cris-softmmu hppa-softmmu
moxie-softmmu microblazeel-softmmu mips64el-softmmu moxie-softmmu microblazeel-softmmu mips64el-softmmu
MAKE_CHECK_ARGS: check-build MAKE_CHECK_ARGS: check-build
@ -607,7 +607,7 @@ tsan-build:
job: amd64-ubuntu2004-container job: amd64-ubuntu2004-container
variables: variables:
IMAGE: ubuntu2004 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 --enable-trace-backends=ust --enable-fdt=system --enable-slirp=system
TARGETS: x86_64-softmmu ppc64-softmmu riscv64-softmmu x86_64-linux-user TARGETS: x86_64-softmmu ppc64-softmmu riscv64-softmmu x86_64-linux-user
MAKE_CHECK_ARGS: bench V=1 MAKE_CHECK_ARGS: bench V=1
@ -619,7 +619,7 @@ build-deprecated:
job: amd64-debian-user-cross-container job: amd64-debian-user-cross-container
variables: variables:
IMAGE: debian-all-test-cross IMAGE: debian-all-test-cross
CONFIGURE_ARGS: --disable-docs --disable-tools CONFIGURE_ARGS: --disable-tools
MAKE_CHECK_ARGS: build-tcg MAKE_CHECK_ARGS: build-tcg
TARGETS: ppc64abi32-linux-user lm32-softmmu unicore32-softmmu TARGETS: ppc64abi32-linux-user lm32-softmmu unicore32-softmmu
artifacts: artifacts: