From 3cd10899e6ca20869cd1bfea92fe13e2c069a191 Mon Sep 17 00:00:00 2001 From: Anton Maklakov Date: Fri, 30 Jun 2017 15:14:02 +0800 Subject: [PATCH] CI: Work around problem with running the initial 'make clean' in parallel (#18) Just don't pass '-j' to the 'make clean' command --- tools/ci/build_examples.sh | 4 ++-- tools/ci/test_build_system.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/ci/build_examples.sh b/tools/ci/build_examples.sh index c87c141a7..14a8e9b42 100755 --- a/tools/ci/build_examples.sh +++ b/tools/ci/build_examples.sh @@ -114,11 +114,11 @@ build_example () { # build non-verbose first local BUILDLOG=$(mktemp -t examplebuild.XXXX.log) ( - make clean defconfig &> >(tee -a "${BUILDLOG}") && + MAKEFLAGS= make clean defconfig &> >(tee -a "${BUILDLOG}") && make all &> >(tee -a "${BUILDLOG}") ) || { RESULT=$?; FAILED_EXAMPLES+=" ${EXAMPLE_NAME}" - make V=1 clean defconfig && make V=1 # verbose output for errors + make MAKEFLAGS= V=1 clean defconfig && make V=1 # verbose output for errors } popd diff --git a/tools/ci/test_build_system.sh b/tools/ci/test_build_system.sh index c4da2f8e9..0d4f36e4d 100755 --- a/tools/ci/test_build_system.sh +++ b/tools/ci/test_build_system.sh @@ -49,7 +49,7 @@ function run_tests() make defconfig || exit $? print_status "Try to clean fresh directory..." - make clean || exit $? + MAKEFLAGS= make clean || exit $? BOOTLOADER_BINS="bootloader/bootloader.elf bootloader/bootloader.bin" APP_BINS="app-template.elf app-template.bin"