Re: [RFC PATCH] gitlab: default to not building the documentation

[Thomas Huth <thuth@redhat.com>]

On 22/03/2021 17.24, Alex Bennée wrote:
> 
> Thomas Huth <thuth@redhat.com> writes:
> 
>> On 22/03/2021 15.41, Alex Bennée wrote:
>>> 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 some coverage.
>>> Fixes: a8a3abe0b3 ("gitlab: move docs and tools build across from
>>> Travis")
>>> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
>>> ---
>>>    .gitlab-ci.yml | 12 ++++++------
>>>    1 file changed, 6 insertions(+), 6 deletions(-)
>>> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
>>> index 9ffbaa7ffb..7714c7cac8 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
>>
>> I think it might be better to add it to the Fedora job - it will
>> likely have a newer version of Sphinx and gets updated more often.
> 
> It's already in build-system-fedora, just the ubuntu one was squashed
> when I moved tools and docs across.

Ah, right, it got enabled in commit d0f26e68a05 there already.

Ok, then I think this patch is fine:

Reviewed-by: Thomas Huth <thuth@redhat.com>