diff options
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | .travis.yml | 14 | ||||
| -rwxr-xr-x | tools/build_adafruit_bins.sh | 16 | ||||
| m--------- | tools/uf2 | 0 |
4 files changed, 23 insertions, 10 deletions
diff --git a/.gitmodules b/.gitmodules index 5430d248d..21af5f0a6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -14,3 +14,6 @@ [submodule "freetouch2"] path = atmel-samd/freetouch url = https://github.com/adafruit/Adafruit_FreeTouch.git +[submodule "tools/uf2"] + path = tools/uf2 + url = https://github.com/Microsoft/uf2.git diff --git a/.travis.yml b/.travis.yml index 5f85b66e0..7be4d47f5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,12 @@ cache: directories: - "${HOME}/persist" +addons: + artifacts: + debug: true + paths: + - $(ls bin/* | tr "\n" ":") + notifications: webhooks: urls: @@ -32,13 +38,7 @@ before_script: script: # Build mpy-cross first because other builds depend on it. - make -C mpy-cross - - make -C atmel-samd BOARD=arduino_zero - - make -C atmel-samd BOARD=feather_m0_basic - - make -C atmel-samd BOARD=feather_m0_express - - make -C atmel-samd BOARD=metro_m0_flash - - make -C atmel-samd BOARD=circuitplayground_express - - make -C atmel-samd BOARD=trinket_m0 - - make -C atmel-samd BOARD=gemma_m0 + - tools/build_adafruit_bins.h - make -C minimal CROSS=1 build/firmware.bin - ls -l minimal/build/firmware.bin - tools/check_code_size.sh diff --git a/tools/build_adafruit_bins.sh b/tools/build_adafruit_bins.sh index 8dcbb274e..c8693f43f 100755 --- a/tools/build_adafruit_bins.sh +++ b/tools/build_adafruit_bins.sh @@ -5,15 +5,25 @@ ATMEL_BOARDS="arduino_zero circuitplayground_express feather_m0_basic feather_m0 for board in $ATMEL_BOARDS; do make -C atmel-samd BOARD=$board + (( exit_status = exit_status || $? )) done make -C esp8266 BOARD=feather_huzzah +(( exit_status = exit_status || $? )) version=`git describe --tags --exact-match` if [ $? -ne 0 ]; then - version=`git rev-parse --short HEAD` + version=`date +%Y%m%d`-`git rev-parse --short HEAD` fi for board in $ATMEL_BOARDS; do - cp atmel-samd/build-$board/firmware.bin bin/adafruit-circuitpython-$board-$version.bin + mkdir -p bin/$board/ + cp atmel-samd/build-$board/firmware.bin bin/$board/adafruit-circuitpython-$board-$version.bin + (( exit_status = exit_status || $? )) + python2 tools/uf2/utils/uf2conv.py -c -o bin/$board/adafruit-circuitpython-$board-$version.uf2 bin/$board/adafruit-circuitpython-$board-$version.bin + (( exit_status = exit_status || $? )) done -cp esp8266/build/firmware-combined.bin bin/adafruit-circuitpython-feather_huzzah-$version.bin +mkdir -p bin/esp8266/ +cp esp8266/build/firmware-combined.bin bin/esp8266/adafruit-circuitpython-feather_huzzah-$version.bin +(( exit_status = exit_status || $? )) + +exit $exit_status diff --git a/tools/uf2 b/tools/uf2 new file mode 160000 +Subproject 449f26673855736dbc0fc3f18d72403f25f6297 |