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/.gitlab-ci.yml b/.gitlab-ci.yml
index 6d7ffdd..51553a1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -190,16 +190,12 @@
- ./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