use fixed number instead of nproc

This commit is contained in:
Matthew Kennedy 2023-03-13 14:03:33 -07:00
parent a4db340aef
commit 556a04b8d4
5 changed files with 5 additions and 6 deletions

View File

@ -9,7 +9,7 @@ echo "Entering $SCRIPT_NAME"
BOOTLOADER_CODE_DESTINATION_FILE=$BOOTLOADER_CODE_DESTINATION_PATH/bootloader_generated.hxx
echo "$SCRIPT_NAME: Starting bootloader compilation..."
make -j$(nproc) -f src/Makefile $1 $2 $3
make -j6 -f src/Makefile $1 $2 $3
# downstream scripts detect error condition by checking if the output file exists so we need to make sure we remove it
[ $? -eq 0 ] || { echo "ERROR: bootloader compilation failed"; rm -f blbuild/$BOOTLOADER_CODE_DESTINATION_FILE ; exit 1; }

View File

@ -12,8 +12,7 @@ echo "Entering $SCRIPT_NAME with board $1 and CPU $2"
cd ../../..
mkdir -p .dep
# todo: start using env variable for number of threads or for '-r'
make -j$(nproc) -r PROJECT_BOARD=$PROJECT_BOARD PROJECT_CPU=$PROJECT_CPU
make -j6 -r PROJECT_BOARD=$PROJECT_BOARD PROJECT_CPU=$PROJECT_CPU
[ -e build/fome.hex ] || { echo "FAILED to compile by $SCRIPT_NAME with $PROJECT_BOARD $DEBUG_LEVEL_OPT and $EXTRA_PARAMS"; exit 1; }
if [ "$USE_OPENBLT" = "yes" ]; then
make openblt PROJECT_BOARD=$PROJECT_BOARD PROJECT_CPU=$PROJECT_CPU

View File

@ -3,7 +3,7 @@
set -e
rm -f build/rusefi_simulator.exe
make -j$(nproc) -r $@
make -j6 -r $@
[ $? -eq 0 ] || { echo "Simulator compilation failed"; exit 1; }
file build/rusefi_simulator
echo "TIMESTAMP $(date "+%D %T.%2N") just compiled rusEFI simulator"

View File

@ -4,4 +4,4 @@ echo "Compiling unit tests"
make clean
# todo: how comes .dep is not being cleaned by 'make clean'?
rm -rf .dep/
make -j$(nproc)
make -j6

View File

@ -1,6 +1,6 @@
#!/bin/bash
make clean
make -j$(nproc)
make -j6
build/rusefi_test
bash ci_gcov.sh "$RUSEFI_DOXYGEN_FTP_USER" "$RUSEFI_DOXYGEN_FTP_PASS" "$RUSEFI_FTP_SERVER"