From: Tom Rini <trini@konsulko.com>
Date: Sun, 20 Aug 2023 17:31:28 +0000 (-0400)
Subject: CI: Combine tools-only and envtools jobs
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=562ed115e7b62fc8cdf61a9ea4577588d705086b;p=u-boot.git

CI: Combine tools-only and envtools jobs

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>
---

diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
index 978d666238..9dfb07d3c7 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 6d7ffdd1bb..51553a1660 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