[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 09/12] gitlab: move docs and tools build across from Travis
From: |
Alex Bennée |
Subject: |
[PATCH v2 09/12] gitlab: move docs and tools build across from Travis |
Date: |
Thu, 14 Jan 2021 16:57:27 +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>
Acked-by: Thomas Huth <thuth@redhat.com>
---
v2
- explicit disable-system/user
- add some comments, reduce size of HTML dump
---
.gitlab-ci.yml | 28 ++++++++++++++++++++++------
.travis.yml | 16 ----------------
2 files changed, 22 insertions(+), 22 deletions(-)
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
- [PATCH v2 06/12] Makefile: wrap etags in quiet-command calls, (continued)