8000 Merge pull request #921 from jepler/travis-build-esp · sparkfun/circuitpython@83b0f62 · GitHub
[go: up one dir, main page]
Skip to content

Commit 83b0f62

Browse files
tannewttannewt
authored
Merge pull request adafruit#921 from jepler/travis-build-esp
Build for feather huzzah on travis-ci
2 parents 068ffd0 + 52c0fc4 commit 83b0f62

File tree

2 files changed

+16
-15
lines changed

2 files changed

+16
-15
lines changed

‎.travis.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ language: c
44
compiler:
55
- gcc
66
env:
7+
- TRAVIS_BOARD=feather_huzzah
78
- TRAVIS_BOARD=arduino_zero
89
- TRAVIS_BOARD=circuitplayground_express
910
- TRAVIS_BOARD=circuitplayground_express_crickit
@@ -57,6 +58,8 @@ before_script:
5758
- sudo apt-get install realpath
5859
# For nrf builds
5960
- ([[ $TRAVIS_BOARD != "feather52" ]] || sudo ports/nrf/drivers/bluetooth/download_ble_stack.sh)
61+
# For huzzah builds
62+
- 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
6063
# For coverage testing (upgrade is used to get latest urllib3 version)
6164
- ([[ -z "$TRAVIS_TEST" ]] || sudo pip install --upgrade cpp-coveralls)
6265
- ([[ $TRAVIS_TEST != "docs" ]] || sudo pip install Sphinx sphinx-rtd-theme recommonmark)

‎tools/build_adafruit_bins.sh

Lines changed: 13 additions & 15 deletions
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"
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"
66
ROSIE_SETUPS="rosie-ci"
77

88
PARALLEL="-j 5"
@@ -17,18 +17,17 @@ else
1717
fi
1818

1919
for board in $boards; do
20-
if [ $board == "feather52" ]; then
20+
if [ $board == "feather_huzzah" ]; then
21+
make $PARALLEL -C ports/esp8266 BOARD=feather_huzzah
22+
(( exit_status = exit_status || $? ))
23+
elif [ $board == "feather52" ]; then
2124
make $PARALLEL -C ports/nrf BOARD=feather52
2225
(( exit_status = exit_status || $? ))
2326
else
2427
make $PARALLEL -C ports/atmel-samd BOARD=$board
2528
(( exit_status = exit_status || $? ))
2629
fi
2730
done
28-
if [ -z "$TRAVIS" ]; then
29-
make $PARALLEL -C ports/esp8266 BOARD=feather_huzzah
30-
(( exit_status = exit_status || $? ))
31-
fi
3231

3332
version=`git describe --tags --exact-match`
3433
if [ $? -ne 0 ]; then
@@ -46,9 +45,15 @@ fi
4645

4746
for board in $boards; do
4847
mkdir -p bin/$board/
49-
if [ $board == "feather52" ]; then
48+
extension=uf2
49+
if [ $board == "feather_huzzah" ]; then
50+
cp ports/esp8266/build/firmware-combined.bin bin/$board/adafruit-circuitpython-$board-$version.bin
51+
(( exit_status = exit_status || $? ))
52+
extension=bin
53+
elif [ $board == "feather52" ]; then
5054
cp ports/nrf/build-$board-s132/firmware.bin bin/$board/adafruit-circuitpython-$board-$version.bin
5155
(( exit_status = exit_status || $? ))
56+
extension=bin
5257
else
5358
cp ports/atmel-samd/build-$board/firmware.bin bin/$board/adafruit-circuitpython-$board-$version.bin
5459
(( exit_status = exit_status || $? ))
@@ -59,16 +64,9 @@ for board in $boards; do
5964
if [ "$TRAVIS" == "true" ]; then
6065
for rosie in $ROSIE_SETUPS; do
6166
echo "Uploading to https://$rosie.ngrok.io/upload/$sha"
62-
curl -F "file=@bin/$board/adafruit-circuitpython-$board-$version.uf2" https://$rosie.ngrok.io/upload/$sha
67+
curl -F "file=@bin/$board/adafruit-circuitpython-$board-$version.$extension" https://$rosie.ngrok.io/upload/$sha
6368
done
6469
fi
6570
done
6671

67-
# Skip ESP8266 on Travis
68-
if [ -z "$TRAVIS" ]; then
69-
mkdir -p bin/esp8266/
70-
cp ports/esp8266/build/firmware-combined.bin bin/esp8266/adafruit-circuitpython-feather_huzzah-$version.bin
71-
(( exit_status = exit_status || $? ))
72-
fi
73-
7472
exit $exit_status

0 commit comments

Comments
 (0)
0