| Message ID | 20201102130926.161183-3-berrange@redhat.com |
|---|---|
| State | Accepted |
| Commit | d0f26e68a0545db5010e8fac7386739a2c7213b3 |
| Headers | show |
| Series | [1/4] gitlab: publish the docs built during CI | expand |
On 11/2/20 2:09 PM, Daniel P. Berrangé wrote: > Meson runs a test to see if Sphinx works, and automatically disables it > on error. This can lead to the CI jobs skipping docs build without > maintainers noticing the problem. Use --enable-docs to force a fatal > error if Sphinx doesn't work on the jobs where we expect it to be OK. > > Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> > --- > .gitlab-ci.yml | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) Shouldn't this patch go first in your series? Inverting 1<->2. Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
On Mon, Nov 02, 2020 at 03:50:39PM +0100, Philippe Mathieu-Daudé wrote: > On 11/2/20 2:09 PM, Daniel P. Berrangé wrote: > > Meson runs a test to see if Sphinx works, and automatically disables it > > on error. This can lead to the CI jobs skipping docs build without > > maintainers noticing the problem. Use --enable-docs to force a fatal > > error if Sphinx doesn't work on the jobs where we expect it to be OK. > > > > Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> > > --- > > .gitlab-ci.yml | 4 +++- > > 1 file changed, 3 insertions(+), 1 deletion(-) > > Shouldn't this patch go first in your series? Inverting 1<->2. Doesn't really matter. The jobs already build docs. It was simply that in creating this series I inserted a bug that broke the detection of sphinx by configure and I didn't notice and wondered why docs were not being created. So I just added this as a safety net to make it easier to detect future messups. > > Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com> > Regards, Daniel
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a41725d6f7..f17bff652d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -80,6 +80,7 @@ build-system-ubuntu: TARGETS: aarch64-softmmu alpha-softmmu cris-softmmu hppa-softmmu moxie-softmmu microblazeel-softmmu mips64el-softmmu MAKE_CHECK_ARGS: check-build + CONFIGURE_ARGS: --enable-docs artifacts: expire_in: 2 days paths: @@ -111,6 +112,7 @@ build-system-debian: TARGETS: arm-softmmu avr-softmmu i386-softmmu mipsel-softmmu riscv64-softmmu sh4eb-softmmu sparc-softmmu xtensaeb-softmmu MAKE_CHECK_ARGS: check-build + CONFIGURE_ARGS: --enable-docs artifacts: expire_in: 2 days paths: @@ -139,7 +141,7 @@ build-system-fedora: <<: *native_build_job_definition variables: IMAGE: fedora - CONFIGURE_ARGS: --disable-gcrypt --enable-nettle + CONFIGURE_ARGS: --disable-gcrypt --enable-nettle --enable-docs TARGETS: tricore-softmmu microblaze-softmmu mips-softmmu xtensa-softmmu m68k-softmmu riscv32-softmmu ppc-softmmu sparc64-softmmu MAKE_CHECK_ARGS: check-build
Meson runs a test to see if Sphinx works, and automatically disables it on error. This can lead to the CI jobs skipping docs build without maintainers noticing the problem. Use --enable-docs to force a fatal error if Sphinx doesn't work on the jobs where we expect it to be OK. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- .gitlab-ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)