From 5da455e39864450157863fdeba27445b6a849043 Mon Sep 17 00:00:00 2001
From: microbuilder <contact@microbuilder.eu>
Date: Thu, 28 Dec 2017 22:35:03 +0100
Subject: [PATCH] Added feather52 to travis build list

---
 .travis.yml                  |  1 +
 tools/build_adafruit_bins.sh | 35 +++++++++++++++++------------------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 330ace5f2e..8e2bbf3221 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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
 
diff --git a/tools/build_adafruit_bins.sh b/tools/build_adafruit_bins.sh
index 8b749d38f5..ae9c256d24 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 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