From b0f977f94143f551ebc7b48c95305659338d1cfa Mon Sep 17 00:00:00 2001
From: Melissa LeBlanc-Williams <melissa@adafruit.com>
Date: Mon, 16 Dec 2019 17:59:33 -0800
Subject: [PATCH] Revert "Make it work with Github CI (#58)"

This reverts commit 29fb06963cb8c06a29421238a6c1832d2e7334d2.
---
 .github/workflows/githubci.yml | 21 ++++++++++-----------
 .travis.yml                    | 15 ++++++++-------
 install.sh                     | 21 +--------------------
 3 files changed, 19 insertions(+), 38 deletions(-)
 mode change 100755 => 100644 install.sh

diff --git a/.github/workflows/githubci.yml b/.github/workflows/githubci.yml
index 6f8b183..e7e306f 100644
--- a/.github/workflows/githubci.yml
+++ b/.github/workflows/githubci.yml
@@ -9,20 +9,19 @@ jobs:
     
     steps:
     - uses: actions/checkout@v1
-    - uses: actions/setup-python@v1
-      with:
-        python-version: '3.x' # Version range or exact version of a Python version to use, using semvers version range syntax.
-        architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
     - name: pre-install
       run: |
         source install.sh
+    - name: install libraries
+      run: |
+        arduino --install-library "Adafruit BusIO"
     - name: test platform
       run: |
-        ./install.sh build_platform esp32
-        ./install.sh build_platform uno
-        ./install.sh build_platform leonardo
-        ./install.sh build_platform zero
-        ./install.sh build_platform esp8266
-        ./install.sh build_platform m4
-        ./install.sh build_platform nrf52840
+        build_platform esp32
+        build_platform uno
+        build_platform leonardo
+        build_platform zero
+        build_platform esp8266
+        build_platform m4
+        build_platform nrf52840
 
diff --git a/.travis.yml b/.travis.yml
index 1c2b1c8..762649a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,18 +14,19 @@ addons:
     packages:
       - python3
       - python3-pip
+      - python3-setuptools
 
 before_install:
   - source $TRAVIS_BUILD_DIR/install.sh
 
 script:
-  - $TRAVIS_BUILD_DIR/install.sh build_platform nrf52840
-  - $TRAVIS_BUILD_DIR/install.sh build_platform esp32
-  - $TRAVIS_BUILD_DIR/install.sh build_platform uno
-  - $TRAVIS_BUILD_DIR/install.sh build_platform leonardo
-  - $TRAVIS_BUILD_DIR/install.sh build_platform zero
-  - $TRAVIS_BUILD_DIR/install.sh build_platform esp8266
-  - $TRAVIS_BUILD_DIR/install.sh build_platform m4
+  - build_platform nrf52840
+  - build_platform esp32
+  - build_platform uno
+  - build_platform leonardo
+  - build_platform zero
+  - build_platform esp8266
+  - build_platform m4
 
 notifications:
   email:
diff --git a/install.sh b/install.sh
old mode 100755
new mode 100644
index 21250f1..701273a
--- a/install.sh
+++ b/install.sh
@@ -32,8 +32,6 @@ export NRF5X_PLATFORMS='declare -A nrf5x_platforms=( [nrf52840]="adafruit:nrf52:
 sleep 3
 export DISPLAY=:1.0
 
-#This condition is to avoid reruning install when build argument is passed
-if [[ $# -eq 0 ]] ; then
 # define colors
 GRAY='\033[1;30m'; RED='\033[0;31m'; LRED='\033[1;31m'; GREEN='\033[0;32m'; LGREEN='\033[1;32m'; ORANGE='\033[0;33m'; YELLOW='\033[1;33m'; BLUE='\033[0;34m'; LBLUE='\033[1;34m'; PURPLE='\033[0;35m'; LPURPLE='\033[1;35m'; CYAN='\033[0;36m'; LCYAN='\033[1;36m'; LGRAY='\033[0;37m'; WHITE='\033[1;37m';
 
@@ -81,7 +79,6 @@ ln -s $TRAVIS_BUILD_DIR $HOME/arduino_ide/libraries/Adafruit_Test_Library
 
 # add the arduino CLI to our PATH
 export PATH="$HOME/arduino_ide:$PATH"
-export PATH="$HOME/.local/bin/:$PATH"
 
 echo -e "\n########################################################################";
 echo -e "${YELLOW}INSTALLING DEPENDENCIES"
@@ -138,12 +135,7 @@ fi
 
 if [[ $INSTALL_NRF52 == 1 ]]; then
   echo -n "ADAFRUIT NRF5X: "
-  pip3 install --user setuptools
   pip3 install --user adafruit-nrfutil
-  pip3 install --user pyserial
-  sudo pip3 install setuptools
-  sudo pip3 install adafruit-nrfutil
-  sudo pip3 install pyserial
   DEPENDENCY_OUTPUT=$(arduino --install-boards adafruit:nrf52 2>&1)
   if [ $? -ne 0 ]; then echo -e "\xe2\x9c\x96 OR CACHED"; else echo -e """$GREEN""\xe2\x9c\x93"; fi
 fi
@@ -167,7 +159,7 @@ export PASS_COUNT=0
 export SKIP_COUNT=0
 export FAIL_COUNT=0
 export PDE_COUNT=0
-else
+
 # build all of the examples for the passed platform
 function build_platform()
 {
@@ -859,14 +851,3 @@ function json_main_platforms()
   echo -e "||||||||||||||||||||||||||||| JSON STATUS ||||||||||||||||||||||||||||||\n"
 
 }
-# define output directory for .hex files
-export ARDUINO_HEX_DIR=$HOME/compiled_arduino_sketches/arduino_build_$TRAVIS_BUILD_NUMBER
-
-# link test library folder to the arduino libraries folder
-ln -s $TRAVIS_BUILD_DIR $HOME/arduino_ide/libraries/Adafruit_Test_Library
-
-# add the arduino CLI to our PATH
-export PATH="$HOME/arduino_ide:$PATH"
-
-"$@"
-fi