Now that we can have "make allyesconfig" build and link, add this type of build to the job which builds host tools as well. In GitLab, make this job rather than binman testsuite be the job which unblocks the next stage of the pipeline. This is because we had been using that job for "sandbox builds", and now that we have an explicit test for that, we should use it.
Signed-off-by: Tom Rini <[email protected]> --- Technically, this still requires: https://patchwork.ozlabs.org/project/uboot/patch/[email protected]/ to be applied first. I will pick that up before applying. --- .azure-pipelines.yml | 8 ++++++-- .gitlab-ci.yml | 10 +++++++--- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 25b0e4c985c8..46655776ffad 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -128,8 +128,8 @@ stages: - script: | ./tools/buildman/buildman --maintainer-check - - job: tools_only - displayName: 'Ensure host tools and env tools build' + - job: allyesconfig_and_tools + displayName: 'Ensure allyesconfig, tools-only and envtools build' pool: vmImage: $(ubuntu_vm) container: @@ -137,6 +137,10 @@ stages: options: $(container_option) steps: - script: | + # Allow pipefail because of how we use 'yes' here. + set +o pipefail; + yes 0 | make allyesconfig oldconfig all -j$(nproc) + make mrproper make tools-only_config tools-only -j$(nproc) make mrproper make tools-only_config envtools -j$(nproc) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 08bea0dd2342..b9843c4ff265 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -32,7 +32,7 @@ stages: .buildman_and_testpy_template: &buildman_and_testpy_dfn stage: test.py retry: 2 # QEMU may be too slow, etc. - needs: [ "Run binman, buildman, dtoc, Kconfig and patman testsuites" ] + needs: [ "Build allyesconfig, tools-only and envtools" ] before_script: # Clone uboot-test-hooks - git config --global --add safe.directory "${CI_PROJECT_DIR}" @@ -195,10 +195,14 @@ Check for configs without MAINTAINERS entry: - ./tools/buildman/buildman --maintainer-check # Ensure host tools build -Build tools-only and envtools: +Build allyesconfig, tools-only and envtools: extends: .testsuites script: - - make tools-only_config tools-only -j$(nproc); + # Allow pipefail because of how we use 'yes' here. + - set +o pipefail; + yes 0 | make allyesconfig oldconfig all -j$(nproc); + make mrproper; + make tools-only_config tools-only -j$(nproc); make mrproper; make tools-only_config envtools -j$(nproc) -- 2.43.0
