From: Tom Rini <trini@konsulko.com>
To: u-boot@lists.denx.de
Subject: [PATCH 3/4] CI: Combine tools-only and envtools jobs
Date: Sun, 20 Aug 2023 13:31:28 -0400 [thread overview]
Message-ID: <20230820173129.781985-3-trini@konsulko.com> (raw)
In-Reply-To: <20230820173129.781985-1-trini@konsulko.com>
These jobs are to confirm specific build targets, on a Linux host. We
can safely combine these two build tests, with a make mrproper in
between.
Signed-off-by: Tom Rini <trini@konsulko.com>
---
.azure-pipelines.yml | 13 ++-----------
.gitlab-ci.yml | 12 ++++--------
2 files changed, 6 insertions(+), 19 deletions(-)
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
index ab3f961e01ee..e0ac7166d653 100644
--- a/.azure-pipelines.yml
+++ b/.azure-pipelines.yml
@@ -126,7 +126,7 @@ stages:
./tools/buildman/buildman --maintainer-check || exit 0
- job: tools_only
- displayName: 'Ensure host tools build'
+ displayName: 'Ensure host tools and env tools build'
pool:
vmImage: $(ubuntu_vm)
container:
@@ -135,16 +135,7 @@ stages:
steps:
- script: |
make tools-only_config tools-only -j$(nproc)
-
- - job: envtools
- displayName: 'Ensure env tools build'
- pool:
- vmImage: $(ubuntu_vm)
- container:
- image: $(ci_runner_image)
- options: $(container_option)
- steps:
- - script: |
+ make mrproper
make tools-only_config envtools -j$(nproc)
- job: utils
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d9f6b31792f3..7400d1225d9e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -190,16 +190,12 @@ Check for configs without MAINTAINERS entry:
- ./tools/buildman/buildman --maintainer-check || exit 0
# Ensure host tools build
-Build tools-only:
+Build tools-only and envtools:
stage: testsuites
script:
- - make tools-only_config tools-only -j$(nproc)
-
-# Ensure env tools build
-Build envtools:
- stage: testsuites
- script:
- - make tools-only_config envtools -j$(nproc)
+ - make tools-only_config tools-only -j$(nproc);
+ make mrproper;
+ make tools-only_config envtools -j$(nproc)
Run binman, buildman, dtoc, Kconfig and patman testsuites:
stage: testsuites
--
2.34.1
next prev parent reply other threads:[~2023-08-20 17:31 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-20 17:31 [PATCH 1/4] Azure: Set the timeout for jobs to the maximum Tom Rini
2023-08-20 17:31 ` [PATCH 2/4] Azure: Rework build the world jobs Tom Rini
2023-08-21 19:11 ` Simon Glass
2023-09-07 1:52 ` Tom Rini
2023-08-20 17:31 ` Tom Rini [this message]
2023-08-21 19:11 ` [PATCH 3/4] CI: Combine tools-only and envtools jobs Simon Glass
2023-09-07 1:52 ` Tom Rini
2023-08-20 17:31 ` [PATCH 4/4] CI: Drop some jobs we didn't really utilize Tom Rini
2023-08-21 19:11 ` Simon Glass
2023-09-07 1:52 ` Tom Rini
2023-08-21 19:11 ` [PATCH 1/4] Azure: Set the timeout for jobs to the maximum Simon Glass
2023-08-29 14:09 ` Tom Rini
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=20230820173129.781985-3-trini@konsulko.com \
--to=trini@konsulko.com \
--cc=u-boot@lists.denx.de \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox