From 30b6deedd272f156350dbcfb3ef76536598f1556 Mon Sep 17 00:00:00 2001
From: Links <help.markus+gitk@gmail.com>
Date: Tue, 6 Feb 2018 20:41:36 +0100
Subject: [PATCH] use travis matrix

---
 .travis.yml      | 34 +++++++++++++---------------------
 travis/common.sh | 22 ++++++++++++++++++++++
 2 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b731a64..29f1cbe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,38 +2,30 @@ sudo: false
 language: bash
 os:
   - linux
+env:
+  global:
+    - IDE_VERSION=1.6.5
+  matrix:
+     CPU="esp8266" BOARD="esp8266com:esp8266:generic"
+     CPU="esp32" BOARD="espressif:esp32:esp32:FlashFreq=80"
 
 script:
   - /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_1.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :1 -ac -screen 0 1280x1024x16
   - sleep 3
   - export DISPLAY=:1.0
-  - wget http://downloads.arduino.cc/arduino-1.6.5-linux64.tar.xz
-  - tar xf arduino-1.6.5-linux64.tar.xz
-  - mv arduino-1.6.5 $HOME/arduino_ide
+  - wget http://downloads.arduino.cc/arduino-$IDE_VERSION-linux64.tar.xz
+  - tar xf arduino-$IDE_VERSION-linux64.tar.xz
+  - mv arduino-$IDE_VERSION $HOME/arduino_ide
   - export PATH="$HOME/arduino_ide:$PATH"
   - which arduino
   - mkdir -p $HOME/Arduino/libraries
   - cp -r $TRAVIS_BUILD_DIR $HOME/Arduino/libraries/arduinoWebSockets
-  - cd $HOME/arduino_ide/hardware
-  - mkdir esp8266com
-  - cd esp8266com
-  - git clone https://github.com/esp8266/Arduino.git esp8266
-  - cd esp8266/tools
-  - python get.py
-  - cd $HOME/arduino_ide/hardware
-  - mkdir espressif
-  - cd espressif
-  - git clone https://github.com/espressif/arduino-esp32.git esp32
-  - cd esp32/tools
-  - python get.py
-  - cd $TRAVIS_BUILD_DIR
   - source $TRAVIS_BUILD_DIR/travis/common.sh
-  - arduino --board esp8266com:esp8266:generic --save-prefs
+  - get_core $CPU
+  - cd $TRAVIS_BUILD_DIR
+  - arduino --board $BOARD --save-prefs
   - arduino --get-pref sketchbook.path
-  - build_sketches arduino $HOME/Arduino/libraries/arduinoWebSockets esp8266
-  - arduino --board espressif:esp32:esp32:FlashFreq=80 --save-prefs
-  - arduino --get-pref sketchbook.path
-  - build_sketches arduino $HOME/Arduino/libraries/arduinoWebSockets esp32
+  - build_sketches arduino $HOME/Arduino/libraries/arduinoWebSockets $CPU
 
 notifications:
   email:
diff --git a/travis/common.sh b/travis/common.sh
index 4bcd81b..1cf8bff 100644
--- a/travis/common.sh
+++ b/travis/common.sh
@@ -22,3 +22,25 @@ function build_sketches()
     done
 }
 
+
+function get_core()
+{
+    cd $HOME/arduino_ide/hardware
+
+    if [ "$1" = "esp8266" ] ; then
+        mkdir esp8266com
+        cd esp8266com
+        git clone https://github.com/esp8266/Arduino.git esp8266
+        cd esp8266/tools
+        python get.py
+    fi
+
+    if [ "$1" = "esp32" ] ; then
+        mkdir espressif
+        cd espressif
+        git clone https://github.com/espressif/arduino-esp32.git esp32
+        cd esp32/tools
+        python get.py
+    fi
+    
+}