On Wed, Jan 13, 2021 at 04:27:54PM +0000, Alex Bennée wrote: > > Daniel P. Berrangé <berra...@redhat.com> writes: > > > On Wed, Jan 13, 2021 at 03:14:08PM +0000, Alex Bennée wrote: > >> While we are at it we might as well check the tag generation. For > >> bonus points we run GNU globals htags into the public pages directory > >> for publishing with the auto generated pages. > >> > >> Signed-off-by: Alex Bennée <alex.ben...@linaro.org> > >> --- > >> .gitlab-ci.yml | 22 ++++++++++++++++------ > >> .travis.yml | 16 ---------------- > >> 2 files changed, 16 insertions(+), 22 deletions(-) > >> > >> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml > >> index 4532f1718a..c07064a4f7 100644 > >> --- a/.gitlab-ci.yml > >> +++ b/.gitlab-ci.yml > >> @@ -79,7 +79,6 @@ 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,7 +110,6 @@ 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: > >> @@ -126,6 +124,17 @@ check-system-debian: > >> IMAGE: debian-amd64 > >> MAKE_CHECK_ARGS: check > >> > >> +build-tools-and-docs-debian: > >> + <<: *native_build_job_definition > >> + variables: > >> + IMAGE: debian-amd64 > >> + MAKE_CHECK_ARGS: ctags gtags TAGS cscope > >> + CONFIGURE_ARGS: --enable-docs --enable-tools > >> + artifacts: > >> + expire_in: 2 days > >> + paths: > >> + - build > > > > Do we actually need this job at all ? > > > > Assuming the depenedancies are in the dockerfile, then all the > > build jobs will be testing docs and tools already, as meson will > > auto enable it. > > I pondered making an explicit --disable-docs to save some run time but > really this is providing a golden build of the docs which can tehn be > deployed bypages.
Oh right I missed that subtle detail. I saw the separate pages job but didn't realize this was a pre-req of it. So with that in mind no objection. > It also ensure the tag generation works for the various tag outputs - > the GNU global output being used to also publish a HTML navigable > version of the source tree. Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
