aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tools: added -e to cygwin build

Browse Source 
error if any part of build fails

also ensure cygwin build in CI is parallelised
This commit is contained in:
Andrew Tridgell 2024-02-14 12:03:10 +11:00
parent 594f96670a
commit 3668616c53
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Tools/scripts/cygwin_build.sh
View File

@ -7,6 +7,7 @@
# the script assumes you start in the root of the ardupilot git tree # the script assumes you start in the root of the ardupilot git tree
set -x set -x
set -e
# TOOLCHAIN=i686-pc-cygwin # TOOLCHAIN=i686-pc-cygwin
TOOLCHAIN=x86_64-pc-cygwin TOOLCHAIN=x86_64-pc-cygwin
@ -22,13 +23,16 @@ git config --global --add safe.directory /cygdrive/d/a/ardupilot/ardupilot
rm -rf artifacts rm -rf artifacts
mkdir artifacts mkdir artifacts
# cygwin doesn't work out the parallelism properly
WAF_OPTIONS="-j8"
( (
python ./waf --color yes --toolchain $TOOLCHAIN --board sitl configure 2>&1 python ./waf --color yes --toolchain $TOOLCHAIN --board sitl configure 2>&1
python ./waf plane 2>&1 python ./waf plane $WAF_OPTIONS 2>&1
python ./waf copter 2>&1 python ./waf copter $WAF_OPTIONS 2>&1
python ./waf heli 2>&1 python ./waf heli $WAF_OPTIONS 2>&1
python ./waf rover 2>&1 python ./waf rover $WAF_OPTIONS 2>&1
python ./waf sub 2>&1 python ./waf sub $WAF_OPTIONS 2>&1
) | tee artifacts/build.txt ) | tee artifacts/build.txt
# copy both with exe and without to cope with differences # copy both with exe and without to cope with differences