Skip to content

Commit 60e9b8f

Browse files
committed
tools: Correct ports directory name
1 parent d665334 commit 60e9b8f

1 file changed

Lines changed: 12 additions & 7 deletions

File tree

tools/build_adafruit_bins.sh

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,20 @@
1-
rm -rf port/atmel-samd/build*
2-
rm -rf port/esp8266/build*
1+
rm -rf ports/atmel-samd/build*
2+
rm -rf ports/esp8266/build*
33

44
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"
55
ROSIE_SETUPS="rosie-ci"
66

7+
PARALLEL="-j 5"
8+
if [ "$TRAVIS" == "true" ]; then
9+
PARALLEL="-j 2"
10+
fi
11+
712
for board in $ATMEL_BOARDS; do
8-
make -C port/atmel-samd BOARD=$board
13+
make $PARALLEL -C ports/atmel-samd BOARD=$board
914
(( exit_status = exit_status || $? ))
1015
done
1116
if [ -z "$TRAVIS" ]; then
12-
make -C port/esp8266 BOARD=feather_huzzah
17+
make $PARALLEL -C ports/esp8266 BOARD=feather_huzzah
1318
(( exit_status = exit_status || $? ))
1419
fi
1520

@@ -29,9 +34,9 @@ fi
2934

3035
for board in $ATMEL_BOARDS; do
3136
mkdir -p bin/$board/
32-
cp port/atmel-samd/build-$board/firmware.bin bin/$board/adafruit-circuitpython-$board-$version.bin
37+
cp ports/atmel-samd/build-$board/firmware.bin bin/$board/adafruit-circuitpython-$board-$version.bin
3338
(( exit_status = exit_status || $? ))
34-
cp port/atmel-samd/build-$board/firmware.uf2 bin/$board/adafruit-circuitpython-$board-$version.uf2
39+
cp ports/atmel-samd/build-$board/firmware.uf2 bin/$board/adafruit-circuitpython-$board-$version.uf2
3540
(( exit_status = exit_status || $? ))
3641
# Only upload to Rosie if its a pull request.
3742
if [ "$TRAVIS" == "true" ]; then
@@ -45,7 +50,7 @@ done
4550
# Skip ESP8266 on Travis
4651
if [ -z "$TRAVIS" ]; then
4752
mkdir -p bin/esp8266/
48-
cp port/esp8266/build/firmware-combined.bin bin/esp8266/adafruit-circuitpython-feather_huzzah-$version.bin
53+
cp ports/esp8266/build/firmware-combined.bin bin/esp8266/adafruit-circuitpython-feather_huzzah-$version.bin
4954
(( exit_status = exit_status || $? ))
5055
fi
5156

0 commit comments

Comments
 (0)