From 14879924bbcf18f47c2ecea5ad3972594d07aa61 Mon Sep 17 00:00:00 2001 From: Bob Long Date: Tue, 31 Dec 2024 17:48:55 +1100 Subject: [PATCH] Tools: cygwin_build: error if part of build fails also ensure cygwin build in CI is parallelized --- Tools/scripts/cygwin_build.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Tools/scripts/cygwin_build.sh b/Tools/scripts/cygwin_build.sh index af1ef8fbb5..d2880514bc 100755 --- a/Tools/scripts/cygwin_build.sh +++ b/Tools/scripts/cygwin_build.sh @@ -7,6 +7,7 @@ # the script assumes you start in the root of the ardupilot git tree set -x +set -e # Get Carbonix version number FIRMWARE_VERSION=$(grep -oP 'define AP_CUSTOM_FIRMWARE_STRING "\K(.*)(?=")' libraries/AP_HAL_ChibiOS/hwdef/CarbonixCommon/version.inc) @@ -26,7 +27,7 @@ mkdir artifacts ( python ./waf --color yes --toolchain $TOOLCHAIN --board sitl configure --define AP_CUSTOM_FIRMWARE_STRING=\"$FIRMWARE_VERSION\" 2>&1 - python ./waf plane 2>&1 + python ./waf plane -j8 2>&1 ) | tee artifacts/build.txt # python ./waf copter 2>&1 # python ./waf heli 2>&1