From 60e9b8f70a8a8bbe0a8a41bdeb868cee46b7b376 Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Tue, 24 Oct 2017 23:06:02 -0700 Subject: tools: Correct ports directory name --- tools/build_adafruit_bins.sh | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'tools') diff --git a/tools/build_adafruit_bins.sh b/tools/build_adafruit_bins.sh index 39352f08a..c7488f28a 100755 --- a/tools/build_adafruit_bins.sh +++ b/tools/build_adafruit_bins.sh @@ -1,15 +1,20 @@ -rm -rf port/atmel-samd/build* -rm -rf port/esp8266/build* +rm -rf ports/atmel-samd/build* +rm -rf ports/esp8266/build* ATMEL_BOARDS="arduino_zero circuitplayground_express feather_m0_basic feather_m0_adalogger feather_m0_express metro_m0_express metro_m4_express trinket_m0 gemma_m0" ROSIE_SETUPS="rosie-ci" +PARALLEL="-j 5" +if [ "$TRAVIS" == "true" ]; then + PARALLEL="-j 2" +fi + for board in $ATMEL_BOARDS; do - make -C port/atmel-samd BOARD=$board + make $PARALLEL -C ports/atmel-samd BOARD=$board (( exit_status = exit_status || $? )) done if [ -z "$TRAVIS" ]; then - make -C port/esp8266 BOARD=feather_huzzah + make $PARALLEL -C ports/esp8266 BOARD=feather_huzzah (( exit_status = exit_status || $? )) fi @@ -29,9 +34,9 @@ fi for board in $ATMEL_BOARDS; do mkdir -p bin/$board/ - cp port/atmel-samd/build-$board/firmware.bin bin/$board/adafruit-circuitpython-$board-$version.bin + cp ports/atmel-samd/build-$board/firmware.bin bin/$board/adafruit-circuitpython-$board-$version.bin (( exit_status = exit_status || $? )) - cp port/atmel-samd/build-$board/firmware.uf2 bin/$board/adafruit-circuitpython-$board-$version.uf2 + cp ports/atmel-samd/build-$board/firmware.uf2 bin/$board/adafruit-circuitpython-$board-$version.uf2 (( exit_status = exit_status || $? )) # Only upload to Rosie if its a pull request. if [ "$TRAVIS" == "true" ]; then @@ -45,7 +50,7 @@ done # Skip ESP8266 on Travis if [ -z "$TRAVIS" ]; then mkdir -p bin/esp8266/ - cp port/esp8266/build/firmware-combined.bin bin/esp8266/adafruit-circuitpython-feather_huzzah-$version.bin + cp ports/esp8266/build/firmware-combined.bin bin/esp8266/adafruit-circuitpython-feather_huzzah-$version.bin (( exit_status = exit_status || $? )) fi -- cgit v1.2.3