djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'nrf52_3.x' of github.com:microbuilder/circuitpython into nrf52_3.x

Browse Source
This commit is contained in:
hathach 2017-12-29 22:44:40 +07:00
commit 6c8d60afc0
2 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@ -13,6 +13,7 @@ env:
- TRAVIS_BOARD=metro_m4_express
- TRAVIS_BOARD=trinket_m0
- TRAVIS_BOARD=gemma_m0
- TRAVIS_BOARD=feather52
- TRAVIS_TEST=qemu
- TRAVIS_TEST=unix
@ -47,6 +48,8 @@ before_script:
# For teensy build
- sudo apt-get install realpath
# For nrf builds
- sudo ports/nrf/drivers/bluetooth/download_ble_stack.sh
# For coverage testing (upgrade is used to get latest urllib3 version)
- sudo pip install --upgrade cpp-coveralls
- gcc --version

35
tools/build_adafruit_bins.sh
View File

@ -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 feather_m0_basic feather_m0_adalogger feather_m0_express metro_m0_express metro_m4_express trinket_m0 gemma_m0"
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 feather52"
ROSIE_SETUPS="rosie-ci"
PARALLEL="-j 5"
@ -17,17 +17,18 @@ else
fi
for board in $boards; do
make $PARALLEL -C ports/atmel-samd BOARD=$board
(( exit_status = exit_status || $? ))
if [ $board == "feather52" ]; then
make $PARALLEL -C ports/nrf BOARD=feather52
(( exit_status = exit_status || $? ))
else
make $PARALLEL -C ports/atmel-samd BOARD=$board
(( exit_status = exit_status || $? ))
fi
done
if [ -z "$TRAVIS" ]; then
make $PARALLEL -C ports/esp8266 BOARD=feather_huzzah
(( exit_status = exit_status || $? ))
fi
if [ -z "$TRAVIS" ]; then
make $PARALLEL -C ports/nrf BOARD=feather52
(( exit_status = exit_status || $? ))
fi
version=`git describe --tags --exact-match`
if [ $? -ne 0 ]; then
@ -45,10 +46,15 @@ fi
for board in $boards; do
mkdir -p bin/$board/
cp ports/atmel-samd/build-$board/firmware.bin bin/$board/adafruit-circuitpython-$board-$version.bin
(( exit_status = exit_status || $? ))
cp ports/atmel-samd/build-$board/firmware.uf2 bin/$board/adafruit-circuitpython-$board-$version.uf2
(( exit_status = exit_status || $? ))
if [ $board == "feather52" ]; then
cp ports/nrf/build-$board/firmware.bin bin/$board/adafruit-circuitpython-$board-$version.bin
(( exit_status = exit_status || $? ))
else
cp ports/atmel-samd/build-$board/firmware.bin bin/$board/adafruit-circuitpython-$board-$version.bin
(( exit_status = exit_status || $? ))
cp ports/atmel-samd/build-$board/firmware.uf2 bin/$board/adafruit-circuitpython-$board-$version.uf2
(( exit_status = exit_status || $? ))
fi
# Only upload to Rosie if its a pull request.
if [ "$TRAVIS" == "true" ]; then
for rosie in $ROSIE_SETUPS; do
@ -65,11 +71,4 @@ if [ -z "$TRAVIS" ]; then
(( exit_status = exit_status || $? ))
fi
# Skip nRF52 on Travis
if [ -z "$TRAVIS" ]; then
mkdir -p bin/nrf/
cp ports/nrf/build-feather52/firmware.bin bin/nrf/adafruit-circuitpython-feather_nrf52-$version.bin
(( exit_status = exit_status || $? ))
fi
exit $exit_status