[RFC,v2] gitlab: default to not building the documentation

Message ID 20210322175238.4503-1-alex.bennee@linaro.org
State New
Headers show
Series
  • [RFC,v2] gitlab: default to not building the documentation
Related show

Commit Message

Alex Bennée March 22, 2021, 5:52 p.m.
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
---
 .gitlab-ci.d/crossbuilds.yml | 15 ++++++++-------
 .gitlab-ci.yml               | 16 ++++++++--------
 2 files changed, 16 insertions(+), 15 deletions(-)

-- 
2.20.1

Comments

Alex Bennée March 22, 2021, 7:39 p.m. | #1
Alex Bennée <alex.bennee@linaro.org> writes:

> 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


Predictably these two fail the documentation build :-/

>   - disable for all cross builds

>   - minor re-word of the commit text

> ---

>  .gitlab-ci.d/crossbuilds.yml | 15 ++++++++-------

>  .gitlab-ci.yml               | 16 ++++++++--------

>  2 files changed, 16 insertions(+), 15 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..c9c4079dbb 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

> @@ -223,7 +223,7 @@ build-system-centos:

>    variables:

>      IMAGE: centos8

>      CONFIGURE_ARGS: --disable-nettle --enable-gcrypt --enable-fdt=system

> -                    --enable-modules

> +                    --enable-modules --enable-docs

>      TARGETS: ppc64-softmmu or1k-softmmu s390x-softmmu

>        x86_64-softmmu rx-softmmu sh4-softmmu nios2-softmmu

>      MAKE_CHECK_ARGS: check-build

> @@ -257,7 +257,7 @@ build-system-opensuse:

>      job: amd64-opensuse-leap-container

>    variables:

>      IMAGE: opensuse-leap

> -    CONFIGURE_ARGS: --enable-fdt=system

> +    CONFIGURE_ARGS: --enable-docs --enable-fdt=system

>      TARGETS: s390x-softmmu x86_64-softmmu aarch64-softmmu

>      MAKE_CHECK_ARGS: check-build

>    artifacts:

> @@ -443,7 +443,7 @@ build-user-centos7:

>      job: amd64-centos7-container

>    variables:

>      IMAGE: centos7

> -    CONFIGURE_ARGS: --disable-system --disable-tools --disable-docs

> +    CONFIGURE_ARGS: --disable-system --disable-tools

>      MAKE_CHECK_ARGS: check-tcg

>  

>  build-some-softmmu-plugins:

> @@ -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:



-- 
Alex Bennée

Patch

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..c9c4079dbb 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
@@ -223,7 +223,7 @@  build-system-centos:
   variables:
     IMAGE: centos8
     CONFIGURE_ARGS: --disable-nettle --enable-gcrypt --enable-fdt=system
-                    --enable-modules
+                    --enable-modules --enable-docs
     TARGETS: ppc64-softmmu or1k-softmmu s390x-softmmu
       x86_64-softmmu rx-softmmu sh4-softmmu nios2-softmmu
     MAKE_CHECK_ARGS: check-build
@@ -257,7 +257,7 @@  build-system-opensuse:
     job: amd64-opensuse-leap-container
   variables:
     IMAGE: opensuse-leap
-    CONFIGURE_ARGS: --enable-fdt=system
+    CONFIGURE_ARGS: --enable-docs --enable-fdt=system
     TARGETS: s390x-softmmu x86_64-softmmu aarch64-softmmu
     MAKE_CHECK_ARGS: check-build
   artifacts:
@@ -443,7 +443,7 @@  build-user-centos7:
     job: amd64-centos7-container
   variables:
     IMAGE: centos7
-    CONFIGURE_ARGS: --disable-system --disable-tools --disable-docs
+    CONFIGURE_ARGS: --disable-system --disable-tools
     MAKE_CHECK_ARGS: check-tcg
 
 build-some-softmmu-plugins:
@@ -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: