Re: [PATCH 3/4] CI: Combine tools-only and envtools jobs

2023-09-06 Thread Tom Rini 
On Sun, Aug 20, 2023 at 01:31:28PM -0400, Tom Rini wrote:

> 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 

Applied to u-boot/next, thanks!

-- 
Tom


signature.asc
Description: PGP signature

Re: [PATCH 3/4] CI: Combine tools-only and envtools jobs

2023-08-21 Thread Simon Glass 
On Sun, 20 Aug 2023 at 11:31, Tom Rini  wrote:
>
> 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 
> ---
>  .azure-pipelines.yml | 13 ++---
>  .gitlab-ci.yml   | 12 
>  2 files changed, 6 insertions(+), 19 deletions(-)

[PATCH 3/4] CI: Combine tools-only and envtools jobs

2023-08-20 Thread Tom Rini 
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 
---
 .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