[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 3/9] gitlab-ci.yml: Move build-tools-and-docs-debian to a better p
From: |
Thomas Huth |
Subject: |
[PULL 3/9] gitlab-ci.yml: Move build-tools-and-docs-debian to a better place |
Date: |
Fri, 12 Mar 2021 18:23:50 +0100 |
The "build-tools-and-docs-debian" job had been added in between
the "check-system-debian" and the "accepance-system-debian" jobs
and thus separates the jobs that belong together. Move it away,
to the end of the file, next to the "pages" job that depends on it.
And while we're at it, also add a proper "needs:" line to the
job so that it can be started as soon as possible instead of always
waiting for the previous stage to finish.
Message-Id: <20210311142211.1547864-2-thuth@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
.gitlab-ci.yml | 28 +++++++++++++++-------------
1 file changed, 15 insertions(+), 13 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 07202f6ffb..871ea45a5f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -167,19 +167,6 @@ check-system-debian:
IMAGE: debian-amd64
MAKE_CHECK_ARGS: check
-# No targets are built here, just tools, docs, and unit tests. This
-# also feeds into the eventual documentation deployment steps later
-build-tools-and-docs-debian:
- <<: *native_build_job_definition
- variables:
- IMAGE: debian-amd64
- MAKE_CHECK_ARGS: check-unit check-softfloat 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:
@@ -746,6 +733,21 @@ build-libvhost-user:
- meson
- ninja
+# No targets are built here, just tools, docs, and unit tests. This
+# also feeds into the eventual documentation deployment steps later
+build-tools-and-docs-debian:
+ <<: *native_build_job_definition
+ needs:
+ job: amd64-debian-container
+ variables:
+ IMAGE: debian-amd64
+ MAKE_CHECK_ARGS: check-unit check-softfloat ctags TAGS cscope
+ CONFIGURE_ARGS: --disable-system --disable-user --enable-docs
--enable-tools
+ artifacts:
+ expire_in: 2 days
+ paths:
+ - build
+
# Prepare for GitLab pages deployment. Anything copied into the
# "public" directory will be deployed to $USER.gitlab.io/$PROJECT
pages:
--
2.27.0
- [PULL 0/9] Gitlab-CI, tests and docs, Thomas Huth, 2021/03/12
- [PULL 2/9] tests: Move benchmarks into a separate folder, Thomas Huth, 2021/03/12
- [PULL 3/9] gitlab-ci.yml: Move build-tools-and-docs-debian to a better place,
Thomas Huth <=
- [PULL 4/9] gitlab-ci.yml: Add some missing dependencies to the jobs, Thomas Huth, 2021/03/12
- [PULL 6/9] gitlab-ci.yml: Merge check-crypto-old jobs into the build-crypto-old jobs, Thomas Huth, 2021/03/12
- [PULL 7/9] tests: remove "make check-speed" in favor of "make bench", Thomas Huth, 2021/03/12
- [PULL 5/9] gitlab-ci.yml: Merge one of the coroutine jobs with the tcg-disabled job, Thomas Huth, 2021/03/12
- [PULL 1/9] tests: Move unit tests into a separate directory, Thomas Huth, 2021/03/12
- [PULL 8/9] MAINTAINERS: Merge the Gitlab-CI section into the generic CI section, Thomas Huth, 2021/03/12
- [PULL 9/9] README: Add Documentation blurb, Thomas Huth, 2021/03/12
- Re: [PULL 0/9] Gitlab-CI, tests and docs, Peter Maydell, 2021/03/14