summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Halbert <halbert@halwitz.org>2018-06-15 21:10:53 -0400
committerGitHub <noreply@github.com>2018-06-15 21:10:53 -0400
commit92b531d0c3ae9a6422af5f6bb780501bee099a2e (patch)
tree10cb3a864e85a0ca640a9a17e864556d70ac68df
parente475256b38be7e5f98a4fb987cfb5f5d82159285 (diff)
parentb4338921de1d3934d2b6620c056cdc5916ec0f04 (diff)
Merge pull request #939 from tannewt/travis840
Add auto-build for nrf52840 development kit, PCA10056
-rw-r--r--.travis.yml3
-rwxr-xr-xtools/build_adafruit_bins.sh9
2 files changed, 10 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 2f850446c..71ed26ff6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,6 +23,7 @@ env:
- TRAVIS_BOARD=trinket_m0
- TRAVIS_BOARD=gemma_m0
- TRAVIS_BOARD=feather52
+ - TRAVIS_BOARD=pca10056
- TRAVIS_TEST=qemu
- TRAVIS_TEST=unix
- TRAVIS_TEST=docs
@@ -57,7 +58,7 @@ before_script:
# For teensy build
- sudo apt-get install realpath
# For nrf builds
- - ([[ $TRAVIS_BOARD != "feather52" ]] || sudo ports/nrf/drivers/bluetooth/download_ble_stack.sh)
+ - ([[ $TRAVIS_BOARD != "feather52" && $TRAVIS_BOARD != "pca10056" ]] || sudo ports/nrf/drivers/bluetooth/download_ble_stack.sh)
# For huzzah builds
- 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
# For coverage testing (upgrade is used to get latest urllib3 version)
diff --git a/tools/build_adafruit_bins.sh b/tools/build_adafruit_bins.sh
index d7d89defa..1b25c1e2f 100755
--- a/tools/build_adafruit_bins.sh
+++ b/tools/build_adafruit_bins.sh
@@ -2,7 +2,7 @@ rm -rf ports/atmel-samd/build*
rm -rf ports/esp8266/build*
rm -rf ports/nrf/build*
-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"
+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"
ROSIE_SETUPS="rosie-ci"
PARALLEL="-j 5"
@@ -23,6 +23,9 @@ for board in $boards; do
elif [ $board == "feather52" ]; then
make $PARALLEL -C ports/nrf BOARD=feather52
(( exit_status = exit_status || $? ))
+ elif [ $board == "pca10056" ]; then
+ make $PARALLEL -C ports/nrf BOARD=pca10056 SD=s140
+ (( exit_status = exit_status || $? ))
else
make $PARALLEL -C ports/atmel-samd BOARD=$board
(( exit_status = exit_status || $? ))
@@ -54,6 +57,10 @@ for board in $boards; do
cp ports/nrf/build-$board-s132/firmware.bin bin/$board/adafruit-circuitpython-$board-$version.bin
(( exit_status = exit_status || $? ))
extension=bin
+ elif [ $board == "pca10056" ]; then
+ cp ports/nrf/build-$board-s140/firmware.bin bin/$board/adafruit-circuitpython-$board-$version.bin
+ (( exit_status = exit_status || $? ))
+ extension=bin
else
cp ports/atmel-samd/build-$board/firmware.bin bin/$board/adafruit-circuitpython-$board-$version.bin
(( exit_status = exit_status || $? ))