From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Fam Zheng" <fam@euphon.net>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Thomas Huth" <thuth@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>
Subject: [PATCH v1 9/9] gitlab: move docs and tools build across from Travis
Date: Wed, 13 Jan 2021 15:14:08 +0000 [thread overview]
Message-ID: <20210113151408.27939-10-alex.bennee@linaro.org> (raw)
In-Reply-To: <20210113151408.27939-1-alex.bennee@linaro.org>
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>
---
.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
+
acceptance-system-debian:
<<: *native_test_job_definition
needs:
@@ -597,13 +606,14 @@ build-libvhost-user:
- ninja
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/src
+ - htags --suggest --tree-view=filetree -m qemu_init
+ -t "Welcome to the QEMU source code" public/src
- 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
next prev parent reply other threads:[~2021-01-13 15:24 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-13 15:13 [PATCH v1 0/9] testing/next (tags!, more travis/shippable deprecation) Alex Bennée
2021-01-13 15:14 ` [PATCH v1 1/9] tests/docker: Remove Debian 9 remnant lines Alex Bennée
2021-01-13 15:14 ` [PATCH v1 2/9] Makefile: add GNU global tags support Alex Bennée
2021-01-13 15:14 ` [PATCH v1 3/9] shippable.yml: Remove jobs duplicated on Gitlab-CI Alex Bennée
2021-01-13 15:14 ` [PATCH v1 4/9] Add newline when generating Dockerfile Alex Bennée
2021-01-13 15:14 ` [PATCH v1 5/9] Makefile: wrap ctags in quiet-command calls Alex Bennée
2021-01-13 15:14 ` [PATCH v1 6/9] Makefile: wrap etags " Alex Bennée
2021-01-13 15:14 ` [PATCH v1 7/9] Makefile: wrap cscope " Alex Bennée
2021-01-13 15:14 ` [PATCH v1 8/9] docker: expand debian-amd64 image to include tag tools Alex Bennée
2021-01-13 15:14 ` Alex Bennée [this message]
2021-01-13 15:35 ` [PATCH v1 9/9] gitlab: move docs and tools build across from Travis Thomas Huth
2021-01-13 15:37 ` Daniel P. Berrangé
2021-01-13 15:46 ` Peter Maydell
2021-01-13 15:49 ` Daniel P. Berrangé
2021-01-13 16:27 ` Alex Bennée
2021-01-13 16:32 ` Daniel P. Berrangé
2021-01-13 19:25 ` Peter Maydell
2021-01-13 17:30 ` Wainer dos Santos Moschetta
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210113151408.27939-10-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=fam@euphon.net \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
--cc=wainersm@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.