Bladeren bron

CI: Work around problem with running the initial 'make clean' in parallel (#18)

    Just don't pass '-j' to the 'make clean' command
Anton Maklakov 8 jaren geleden
bovenliggende
commit
3cd10899e6
2 gewijzigde bestanden met toevoegingen van 3 en 3 verwijderingen
  1. 2 2
      tools/ci/build_examples.sh
  2. 1 1
      tools/ci/test_build_system.sh

+ 2 - 2
tools/ci/build_examples.sh

@@ -114,11 +114,11 @@ build_example () {
         # build non-verbose first
         # build non-verbose first
         local BUILDLOG=$(mktemp -t examplebuild.XXXX.log)
         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}")
             make all &> >(tee -a "${BUILDLOG}")
         ) || {
         ) || {
             RESULT=$?; FAILED_EXAMPLES+=" ${EXAMPLE_NAME}"
             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
     popd
 
 

+ 1 - 1
tools/ci/test_build_system.sh

@@ -49,7 +49,7 @@ function run_tests()
     make defconfig || exit $?
     make defconfig || exit $?
 
 
     print_status "Try to clean fresh directory..."
     print_status "Try to clean fresh directory..."
-    make clean || exit $?
+    MAKEFLAGS= make clean || exit $?
 
 
     BOOTLOADER_BINS="bootloader/bootloader.elf bootloader/bootloader.bin"
     BOOTLOADER_BINS="bootloader/bootloader.elf bootloader/bootloader.bin"
     APP_BINS="app-template.elf app-template.bin"
     APP_BINS="app-template.elf app-template.bin"