[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 09/30] gitlab: move docs and tools build across from Travis
From: |
Alex Bennée |
Subject: |
[PULL 09/30] gitlab: move docs and tools build across from Travis |
Date: |
Fri, 15 Jan 2021 13:08:07 +0000 |
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>
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4532f1718a..bd60f3e741 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 TAGS cscope
+ CONFIGURE_ARGS: --disable-system --disable-user --enable-docs
--enable-tools
+ artifacts:
+ expire_in: 2 days
+ paths:
+ - build
+
acceptance-system-debian:
<<: *native_test_job_definition
needs:
@@ -596,14 +605,21 @@ build-libvhost-user:
- meson
- ninja
+# Prepare for GitLab pages deployment. Anything copied into the
+# "public" directory will be deployed to $USER.gitlab.io/$PROJECT
pages:
- image: $CI_REGISTRY_IMAGE/qemu/ubuntu2004:latest
+ image: $CI_REGISTRY_IMAGE/qemu/debian-amd64:latest
stage: test
needs:
- - job: build-system-ubuntu
- artifacts: true
+ - job: build-tools-and-docs-debian
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/
- for i in devel interop specs system tools user ; do mv build/docs/$i
public/ ; done
artifacts:
diff --git a/.travis.yml b/.travis.yml
index f2a101936c..3b574a5968 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -148,22 +148,6 @@ jobs:
- 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)
- name: "Clang (user)"
env:
--
2.20.1
- [PULL 18/30] gdbstub: drop CPUEnv from gdb_exit(), (continued)
- [PULL 18/30] gdbstub: drop CPUEnv from gdb_exit(), Alex Bennée, 2021/01/15
- [PULL 19/30] gdbstub: drop gdbserver_cleanup in favour of gdb_exit, Alex Bennée, 2021/01/15
- [PULL 23/30] semihosting: Change common-semi API to be architecture-independent, Alex Bennée, 2021/01/15
- [PULL 08/30] docker: expand debian-amd64 image to include tag tools, Alex Bennée, 2021/01/15
- [PULL 27/30] riscv: Add semihosting support for user mode, Alex Bennée, 2021/01/15
- [PULL 20/30] gdbstub: ensure we clean-up when terminated, Alex Bennée, 2021/01/15
- [PULL 22/30] semihosting: Move ARM semihosting code to shared directories, Alex Bennée, 2021/01/15
- [PULL 15/30] Revert "tests/tcg/multiarch/Makefile.target: Disable run-gdbstub-sha1 test", Alex Bennée, 2021/01/15
- [PULL 10/30] Fix build with new yank feature by adding stubs, Alex Bennée, 2021/01/15
- [PULL 11/30] gitlab: migrate the minimal tools and unit tests from Travis, Alex Bennée, 2021/01/15
- [PULL 09/30] gitlab: move docs and tools build across from Travis,
Alex Bennée <=
- [PULL 26/30] riscv: Add semihosting support, Alex Bennée, 2021/01/15
- [PULL 12/30] scripts/checkpatch.pl: fix git-show invocation to include diffstat, Alex Bennée, 2021/01/15
- [PULL 24/30] semihosting: Change internal common-semi interfaces to use CPUState *, Alex Bennée, 2021/01/15
- Re: [PULL 00/30] testing, gdbstub and semihosting, Peter Maydell, 2021/01/15