10000 Merge pull request #939 from tannewt/travis840 · sparkfun/circuitpython@92b531d · GitHub
[go: up one dir, main page]
Skip to content

Commit 92b531d

Browse files
dhalbertdhalbert
authored
Merge pull request adafruit#939 from tannewt/travis840
Add auto-build for nrf52840 development kit, PCA10056
2 parents e475256 + b433892 commit 92b531d

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

‎.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ env:
2323
- TRAVIS_BOARD=trinket_m0
2424
- TRAVIS_BOARD=gemma_m0
2525
- TRAVIS_BOARD=feather52
26+
- TRAVIS_BOARD=pca10056
2627
- TRAVIS_TEST=qemu
2728
- TRAVIS_TEST=unix
2829
- TRAVIS_TEST=docs
@@ -57,7 +58,7 @@ before_script:
5758
# For teensy build
5859
- sudo apt-get install realpath
5960
# For nrf builds
60-
- ([[ $TRAVIS_BOARD != "feather52" ]] || sudo ports/nrf/drivers/bluetooth/download_ble_stack.sh)
61+
- ([[ $TRAVIS_BOARD != "feather52" && $TRAVIS_BOARD != "pca10056" ]] || sudo ports/nrf/drivers/bluetooth/download_ble_stack.sh)
6162
# For huzzah builds
6263
- if [[ $TRAVIS_BOARD = "feather_huzzah" ]]; then wget https://github.com/jepler/esp-open-sdk/releases/download/2018-06-10/xtensa-lx106-elf-standalone.tar.gz && tar xavf xtensa-lx106-elf-standalone.tar.gz; PATH=$(readlink -f xtensa-lx106-elf/bin):$PATH; fi
6364
# For coverage testing (upgrade is used to get latest urllib3 version)

‎tools/build_adafruit_bins.sh

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ rm -rf ports/atmel-samd/build*
22
rm -rf ports/esp8266/build*
33
rm -rf ports/nrf/build*
44

5-
ATMEL_BOARDS="arduino_zero circuitplayground_express circuitplayground_express_crickit feather_m0_basic feather_m0_adalogger itsybitsy_m0_express itsybitsy_m4_express feather_m0_rfm69 feather_m0_rfm9x feather_m0_express feather_m0_express_crickit feather_m4_express metro_m0_express metro_m4_express pirkey_m0 trinket_m0 gemma_m0 feather52 feather_huzzah"
5+
ATMEL_BOARDS="arduino_zero circuitplayground_express circuitplayground_express_crickit feather_m0_basic feather_m0_adalogger itsybitsy_m0_express itsybitsy_m4_express feather_m0_rfm69 feather_m0_rfm9x feather_m0_express feather_m0_express_crickit feather_m4_express metro_m0_express metro_m4_express pirkey_m0 trinket_m0 gemma_m0 feather52 feather_huzzah pca10056"
66
ROSIE_SETUPS="rosie-ci"
77

88
PARALLEL="-j 5"
@@ -23,6 +23,9 @@ for board in $boards; do
2323
elif [ $board == "feather52" ]; then
2424
make $PARALLEL -C ports/nrf BOARD=feather52
2525
(( exit_status = exit_status || $? ))
26+
elif [ $board == "pca10056" ]; then
27+
make $PARALLEL -C ports/nrf BOARD=pca10056 SD=s140
28+
(( exit_status = exit_status || $? ))
2629
else
2730
make $PARALLEL -C ports/atmel-samd BOARD=$board
2831
(( exit_status = exit_status || $? ))
@@ -54,6 +57,10 @@ for board in $boards; do
5457
cp ports/nrf/build-$board-s132/firmware.bin bin/$board/adafruit-circuitpython-$board-$version.bin
5558
(( exit_status = exit_status || $? ))
5659
extension=bin
60+
elif [ $board == "pca10056" ]; then
61+
cp ports/nrf/build-$board-s140/firmware.bin bin/$board/adafruit-circuitpython-$board-$version.bin
62+
(( exit_status = exit_status || $? ))
63+
extension=bin
5764
else
5865
cp ports/atmel-samd/build-$board/firmware.bin bin/$board/adafruit-circuitpython-$board-$version.bin
5966
(( exit_status = exit_status || $? ))

0 commit comments

Comments
 (0)
0