From c3ac1eb0aaa1cc761272e4c4c936b21540550ab6 Mon Sep 17 00:00:00 2001 From: Oleksandr Suvorov Date: Tue, 25 May 2021 23:42:22 +0300 Subject: gitlab.ci: Workaround for u-boot building Split building u-boot for Apalis and Colibri modules. It fixes the buildman stucking. Signed-off-by: Oleksandr Suvorov --- .gitlab-ci.yml | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f9eb91eadf..08b4523ec7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -60,14 +60,25 @@ stages: ${TEST_PY_TEST_SPEC:+"-k ${TEST_PY_TEST_SPEC}"} --build-dir "$UBOOT_TRAVIS_BUILD_DIR" -build all 32bit Toradex boards: +build Apalis 32bit Toradex boards: tags: [ 'all' ] stage: toradex build script: - ret=0; - ./tools/buildman/buildman -o /tmp -P -W toradex -x aarch64 || ret=$?; - if [[ $ret -ne 0 ]]; then - ./tools/buildman/buildman -o /tmp -seP; + ./tools/buildman/buildman -o /tmp/ -P -W 'toradex & apalis' -x aarch64 || ret=$?; + if [[ $ret -ne 0 ]]; then \ + ./tools/buildman/buildman -o /tmp/ -seP; + exit $ret; + fi; + +build Colibri i.MX 32bit Toradex boards: + tags: [ 'all' ] + stage: toradex build + script: + - ret=0; + ./tools/buildman/buildman -o /tmp/ -P -W 'toradex & colibri-imx' -x aarch64 || ret=$?; + if [[ $ret -ne 0 ]]; then \ + ./tools/buildman/buildman -o /tmp/ -seP; exit $ret; fi; @@ -80,7 +91,7 @@ build all 64bit Toradex boards: - pip install pyelftools - ret=0; ./tools/buildman/buildman -o /tmp -P -E -W 'toradex & aarch64' || ret=$?; - if [[ $ret -ne 0 ]]; then + if [[ $ret -ne 0 ]]; then \ ./tools/buildman/buildman -o /tmp -seP; exit $ret; fi; -- cgit v1.2.3