gitlab: move docs and tools build across from Travis

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.bennee@linaro.org>
Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Acked-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20210114165730.31607-10-alex.bennee@linaro.org>
master
Alex Bennée 2021-01-14 16:57:27 +00:00
parent ec9d7c38ec
commit a8a3abe0b3
2 changed files with 22 additions and 22 deletions

View File

@ -79,7 +79,6 @@ build-system-ubuntu:
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
CONFIGURE_ARGS: --enable-docs
artifacts: artifacts:
expire_in: 2 days expire_in: 2 days
paths: paths:
@ -111,7 +110,6 @@ build-system-debian:
TARGETS: arm-softmmu avr-softmmu i386-softmmu mipsel-softmmu TARGETS: arm-softmmu avr-softmmu i386-softmmu mipsel-softmmu
riscv64-softmmu sh4eb-softmmu sparc-softmmu xtensaeb-softmmu riscv64-softmmu sh4eb-softmmu sparc-softmmu xtensaeb-softmmu
MAKE_CHECK_ARGS: check-build MAKE_CHECK_ARGS: check-build
CONFIGURE_ARGS: --enable-docs
artifacts: artifacts:
expire_in: 2 days expire_in: 2 days
paths: paths:
@ -126,6 +124,17 @@ check-system-debian:
IMAGE: debian-amd64 IMAGE: debian-amd64
MAKE_CHECK_ARGS: check MAKE_CHECK_ARGS: check
build-tools-and-docs-debian:
<<: *native_build_job_definition
variables:
IMAGE: debian-amd64
MAKE_CHECK_ARGS: ctags TAGS cscope
CONFIGURE_ARGS: --disable-system --disable-user --enable-docs --enable-tools
artifacts:
expire_in: 2 days
paths:
- build
acceptance-system-debian: acceptance-system-debian:
<<: *native_test_job_definition <<: *native_test_job_definition
needs: needs:
@ -596,14 +605,21 @@ build-libvhost-user:
- meson - meson
- ninja - ninja
# Prepare for GitLab pages deployment. Anything copied into the
# "public" directory will be deployed to $USER.gitlab.io/$PROJECT
pages: pages:
image: $CI_REGISTRY_IMAGE/qemu/ubuntu2004:latest image: $CI_REGISTRY_IMAGE/qemu/debian-amd64:latest
stage: test stage: test
needs: needs:
- job: build-system-ubuntu - job: build-tools-and-docs-debian
artifacts: true
script: script:
- mkdir public - mkdir -p public
# HTML-ised source tree
- make gtags
- htags -anT --tree-view=filetree -m qemu_init
-t "Welcome to the QEMU sourcecode"
- mv HTML public/src
# Project documentation
- mv build/docs/index.html public/ - mv build/docs/index.html public/
- for i in devel interop specs system tools user ; do mv build/docs/$i public/ ; done - for i in devel interop specs system tools user ; do mv build/docs/$i public/ ; done
artifacts: artifacts:

View File

@ -148,22 +148,6 @@ jobs:
- CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default" - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default"
# Check we can build docs and tools (out of tree)
- name: "tools and docs (bionic)"
dist: bionic
env:
- BUILD_DIR="out-of-tree/build/dir" SRC_DIR="../../.."
- BASE_CONFIG="--enable-tools --enable-docs"
- CONFIG="--target-list=x86_64-softmmu,aarch64-linux-user"
- CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default"
addons:
apt:
packages:
- ninja-build
- python3-sphinx
- perl
# Test with Clang for compile portability (Travis uses clang-5.0) # Test with Clang for compile portability (Travis uses clang-5.0)
- name: "Clang (user)" - name: "Clang (user)"
env: env: