From 31d53b18beb445f830e1a54920118fe3080a39f3 Mon Sep 17 00:00:00 2001 From: Chris Liebman Date: Tue, 20 Mar 2018 09:58:34 -0700 Subject: [PATCH 01/13] travis testing --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 64fb578..60a1abd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,9 +3,9 @@ before_install: - "/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 - - sudo mv arduino-1.6.5 /usr/local/share/arduino + - wget http://downloads.arduino.cc/arduino-1.8.5-linux64.tar.xz + - tar xf arduino-1.8.5-linux64.tar.xz + - sudo mv arduino-1.8.5 /usr/local/share/arduino - sudo ln -s /usr/local/share/arduino/arduino /usr/local/bin/arduino install: - ln -s $PWD /usr/local/share/arduino/libraries/WiFiManager @@ -13,7 +13,7 @@ install: - arduino --pref "boardsmanager.additional.urls=http://arduino.esp8266.com/stable/package_esp8266com_index.json" --save-prefs # install lib arduino json not working in 1.6.5 # - arduino --install-library "ArduinoJson" - - git clone https://github.com/bblanchon/ArduinoJson /usr/local/share/arduino/libraries/ArduinoJson +# - git clone https://github.com/bblanchon/ArduinoJson /usr/local/share/arduino/libraries/ArduinoJson - arduino --install-boards esp8266:esp8266 - arduino --board esp8266:esp8266:generic --save-prefs - arduino --pref "compiler.warning_level=all" --save-prefs From 839a421ff116481a7eba37b2b7bca22ff9f38d94 Mon Sep 17 00:00:00 2001 From: Chris Liebman Date: Tue, 20 Mar 2018 10:03:54 -0700 Subject: [PATCH 02/13] travis testing --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 60a1abd..f52002e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ install: # - arduino --install-library "ArduinoJson" # - git clone https://github.com/bblanchon/ArduinoJson /usr/local/share/arduino/libraries/ArduinoJson - arduino --install-boards esp8266:esp8266 - - arduino --board esp8266:esp8266:generic --save-prefs + - arduino --board esp8266:esp8266:generic:CpuFrequency=80,CrystalFreq=26,FlashFreq=40,FlashMode=qio,FlashSize=4M1M,led=2,LwIPVariant=v2mss536,Debug=Serial,DebugLevel=CORE --save-prefs - arduino --pref "compiler.warning_level=all" --save-prefs script: - "echo $PWD" From 6f84964894673a6c2f77113b61b9e89e80392afa Mon Sep 17 00:00:00 2001 From: Chris Liebman Date: Tue, 20 Mar 2018 10:16:08 -0700 Subject: [PATCH 03/13] fixing travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f52002e..a9de247 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ install: # boards manager not working on 1.6.7 - 1.6.8 - arduino --pref "boardsmanager.additional.urls=http://arduino.esp8266.com/stable/package_esp8266com_index.json" --save-prefs # install lib arduino json not working in 1.6.5 -# - arduino --install-library "ArduinoJson" + - arduino --install-library "ArduinoJson" # - git clone https://github.com/bblanchon/ArduinoJson /usr/local/share/arduino/libraries/ArduinoJson - arduino --install-boards esp8266:esp8266 - arduino --board esp8266:esp8266:generic:CpuFrequency=80,CrystalFreq=26,FlashFreq=40,FlashMode=qio,FlashSize=4M1M,led=2,LwIPVariant=v2mss536,Debug=Serial,DebugLevel=CORE --save-prefs From 19d578e04b49b62ac672e5c8c49abb5bb403c3b0 Mon Sep 17 00:00:00 2001 From: Chris Liebman Date: Tue, 20 Mar 2018 10:43:22 -0700 Subject: [PATCH 04/13] add esp32 --- .travis.yml | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index a9de247..48e02e6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,24 +9,31 @@ before_install: - sudo ln -s /usr/local/share/arduino/arduino /usr/local/bin/arduino install: - ln -s $PWD /usr/local/share/arduino/libraries/WiFiManager -# boards manager not working on 1.6.7 - 1.6.8 - arduino --pref "boardsmanager.additional.urls=http://arduino.esp8266.com/stable/package_esp8266com_index.json" --save-prefs -# install lib arduino json not working in 1.6.5 - arduino --install-library "ArduinoJson" -# - git clone https://github.com/bblanchon/ArduinoJson /usr/local/share/arduino/libraries/ArduinoJson - arduino --install-boards esp8266:esp8266 - - arduino --board esp8266:esp8266:generic:CpuFrequency=80,CrystalFreq=26,FlashFreq=40,FlashMode=qio,FlashSize=4M1M,led=2,LwIPVariant=v2mss536,Debug=Serial,DebugLevel=CORE --save-prefs +2mss536,Debug=Serial,DebugLevel=CORE --save-prefs - arduino --pref "compiler.warning_level=all" --save-prefs +# install esp32 + - pushd . + - mkdir -p ~/Arduino/hardware/espressif + - cd ~/Arduino/hardware/espressif + - git clone https://github.com/espressif/arduino-esp32.git esp32 + - cd esp32 + - git submodule update --init --recursive + - cd tools + - python2 get.py + - popd script: - "echo $PWD" - "echo $HOME" - "ls $PWD" - source $TRAVIS_BUILD_DIR/travis/common.sh + - arduino --board esp8266:esp8266:generic:CpuFrequency=80,CrystalFreq=26,FlashFreq=40,FlashMode=qio,FlashSize=4M1M,led=2,LwIPVariant=v - build_examples + - arduino --board espressif:esp32:esp32:FlashMode=qio,FlashFreq=80,FlashSize=4M,DebugLevel=info --save-prefs - build_examples # - "cat $PWD/examples/AutoConnect/AutoConnect.ino" # - arduino -v --verbose-build --verify $PWD/examples/AutoConnect/AutoConnect.ino -# - arduino --verify --board arduino:avr:uno $PWD/examples/IncomingCall/IncomingCall.ino -# - arduino --verify --board arduino:avr:uno $PWD/examples/AdafruitIO_GPS/AdafruitIO_GPS.ino after_success: - bash <(curl -s https://codecov.io/bash) notifications: From 10d6deadc23389adece0f885c84f7cfe554c0ef3 Mon Sep 17 00:00:00 2001 From: Chris Liebman Date: Tue, 20 Mar 2018 10:51:55 -0700 Subject: [PATCH 05/13] add esp32 --- .travis.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 48e02e6..1d52dd4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,6 @@ language: c +sudo: false + before_install: - "/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 @@ -12,7 +14,7 @@ install: - arduino --pref "boardsmanager.additional.urls=http://arduino.esp8266.com/stable/package_esp8266com_index.json" --save-prefs - arduino --install-library "ArduinoJson" - arduino --install-boards esp8266:esp8266 -2mss536,Debug=Serial,DebugLevel=CORE --save-prefs + - arduino --pref "compiler.warning_level=all" --save-prefs # install esp32 - pushd . @@ -29,11 +31,13 @@ script: - "echo $HOME" - "ls $PWD" - source $TRAVIS_BUILD_DIR/travis/common.sh - - arduino --board esp8266:esp8266:generic:CpuFrequency=80,CrystalFreq=26,FlashFreq=40,FlashMode=qio,FlashSize=4M1M,led=2,LwIPVariant=v - build_examples + - arduino --board esp8266:esp8266:generic:CpuFrequency=80,CrystalFreq=26,FlashFreq=40,FlashMode=qio,FlashSize=4M1M,led=2,LwIPVariant=v2mss536,Debug=Serial,DebugLevel=CORE --save-prefs + - build_examples - arduino --board espressif:esp32:esp32:FlashMode=qio,FlashFreq=80,FlashSize=4M,DebugLevel=info --save-prefs - build_examples -# - "cat $PWD/examples/AutoConnect/AutoConnect.ino" # - arduino -v --verbose-build --verify $PWD/examples/AutoConnect/AutoConnect.ino +# - arduino --verify --board arduino:avr:uno $PWD/examples/IncomingCall/IncomingCall.ino +# - arduino --verify --board arduino:avr:uno $PWD/examples/AdafruitIO_GPS/AdafruitIO_GPS.ino after_success: - bash <(curl -s https://codecov.io/bash) notifications: From c358378a27138e3499a66bca9e1a43864bc6aaf1 Mon Sep 17 00:00:00 2001 From: Chris Liebman Date: Tue, 20 Mar 2018 11:16:49 -0700 Subject: [PATCH 06/13] add esp32 --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1d52dd4..2052d35 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,8 +36,7 @@ script: - arduino --board espressif:esp32:esp32:FlashMode=qio,FlashFreq=80,FlashSize=4M,DebugLevel=info --save-prefs - build_examples # - arduino -v --verbose-build --verify $PWD/examples/AutoConnect/AutoConnect.ino -# - arduino --verify --board arduino:avr:uno $PWD/examples/IncomingCall/IncomingCall.ino -# - arduino --verify --board arduino:avr:uno $PWD/examples/AdafruitIO_GPS/AdafruitIO_GPS.ino + after_success: - bash <(curl -s https://codecov.io/bash) notifications: From 28ed839274c118f62d1b51702b326dfcb1433453 Mon Sep 17 00:00:00 2001 From: Chris Liebman Date: Tue, 20 Mar 2018 11:16:58 -0700 Subject: [PATCH 07/13] add esp32 --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 2052d35..1d6ec94 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,6 +26,8 @@ install: - cd tools - python2 get.py - popd +# esp32 needs WebServer_tng for now + - git clone https://github.com/bbx10/WebServer_tng.git /usr/local/share/arduino/libraries/WebServer_tng script: - "echo $PWD" - "echo $HOME" From fe8f38aa59674f24a130428b1adf33686fd04278 Mon Sep 17 00:00:00 2001 From: Chris Liebman Date: Tue, 20 Mar 2018 12:07:35 -0700 Subject: [PATCH 08/13] add esp32 --- .travis.yml | 11 ++++++----- travis/common.sh | 9 +++++++++ 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1d6ec94..22e09d2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,6 @@ install: - arduino --pref "boardsmanager.additional.urls=http://arduino.esp8266.com/stable/package_esp8266com_index.json" --save-prefs - arduino --install-library "ArduinoJson" - arduino --install-boards esp8266:esp8266 - - arduino --pref "compiler.warning_level=all" --save-prefs # install esp32 - pushd . @@ -33,10 +32,12 @@ script: - "echo $HOME" - "ls $PWD" - source $TRAVIS_BUILD_DIR/travis/common.sh - - arduino --board esp8266:esp8266:generic:CpuFrequency=80,CrystalFreq=26,FlashFreq=40,FlashMode=qio,FlashSize=4M1M,led=2,LwIPVariant=v2mss536,Debug=Serial,DebugLevel=CORE --save-prefs - - build_examples - - arduino --board espressif:esp32:esp32:FlashMode=qio,FlashFreq=80,FlashSize=4M,DebugLevel=info --save-prefs - - build_examples +# - arduino --board esp8266:esp8266:generic:CpuFrequency=80,CrystalFreq=26,FlashFreq=40,FlashMode=qio,FlashSize=4M1M,led=2,LwIPVariant=v2mss536,Debug=Serial,DebugLevel=CORE --save-prefs +# - build_examples + - arduino --board espressif:esp32:nodemcu-32s --save-prefs +# some examples fail (SPIFFS defines differ esp32 vs esp8266) so we exclude them + - excludes=("AutoConnectWithFSParametersAndCustomIP.ino" "AutoConnectWithFSParameters.ino") + - build_examples "${excludes[@]}" # - arduino -v --verbose-build --verify $PWD/examples/AutoConnect/AutoConnect.ino after_success: diff --git a/travis/common.sh b/travis/common.sh index d115085..6f0badf 100644 --- a/travis/common.sh +++ b/travis/common.sh @@ -2,6 +2,7 @@ function build_examples() { + excludes=("$@") # track the exit code for this platform local exit_code=0 # loop through results and add them to the array @@ -19,6 +20,14 @@ function build_examples() # store the filename for the example without the path local example_file=$(basename $example) + # skip files listed as excludes + for exclude in "${excludes[@]}"; do + if [ "${example_file}" == "${exclude}" ] ; then + echo "Skipping ${example_file}!" + continue 2 + fi + done + echo "$example_file: " local sketch="$example_dir/$example_file" echo "$sketch" From 3891c0a631f95e623b0827a660ccb144843b8d0a Mon Sep 17 00:00:00 2001 From: Chris Liebman Date: Tue, 20 Mar 2018 12:48:41 -0700 Subject: [PATCH 09/13] add esp32 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 22e09d2..2f8b5c7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,7 +34,7 @@ script: - source $TRAVIS_BUILD_DIR/travis/common.sh # - arduino --board esp8266:esp8266:generic:CpuFrequency=80,CrystalFreq=26,FlashFreq=40,FlashMode=qio,FlashSize=4M1M,led=2,LwIPVariant=v2mss536,Debug=Serial,DebugLevel=CORE --save-prefs # - build_examples - - arduino --board espressif:esp32:nodemcu-32s --save-prefs + - arduino --board espressif:esp32:nodemcu-32s:FlashMode=qio,FlashFreq=80,FlashSize=4M,DebugLevel=info --save-prefs # some examples fail (SPIFFS defines differ esp32 vs esp8266) so we exclude them - excludes=("AutoConnectWithFSParametersAndCustomIP.ino" "AutoConnectWithFSParameters.ino") - build_examples "${excludes[@]}" From 9e5c1b5fe2e91f82e62594cbe28235c955b1e53f Mon Sep 17 00:00:00 2001 From: Chris Liebman Date: Tue, 20 Mar 2018 12:55:44 -0700 Subject: [PATCH 10/13] add esp32 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2f8b5c7..d155b97 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,7 +34,7 @@ script: - source $TRAVIS_BUILD_DIR/travis/common.sh # - arduino --board esp8266:esp8266:generic:CpuFrequency=80,CrystalFreq=26,FlashFreq=40,FlashMode=qio,FlashSize=4M1M,led=2,LwIPVariant=v2mss536,Debug=Serial,DebugLevel=CORE --save-prefs # - build_examples - - arduino --board espressif:esp32:nodemcu-32s:FlashMode=qio,FlashFreq=80,FlashSize=4M,DebugLevel=info --save-prefs + - arduino --board espressif:esp32:NodeMCU-32S:FlashFreq=80 --save-prefs # some examples fail (SPIFFS defines differ esp32 vs esp8266) so we exclude them - excludes=("AutoConnectWithFSParametersAndCustomIP.ino" "AutoConnectWithFSParameters.ino") - build_examples "${excludes[@]}" From e4605775a2254de6de667146b2b24656fa0a1d43 Mon Sep 17 00:00:00 2001 From: Chris Liebman Date: Tue, 20 Mar 2018 13:09:01 -0700 Subject: [PATCH 11/13] add esp32 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d155b97..f4b056e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,7 +34,7 @@ script: - source $TRAVIS_BUILD_DIR/travis/common.sh # - arduino --board esp8266:esp8266:generic:CpuFrequency=80,CrystalFreq=26,FlashFreq=40,FlashMode=qio,FlashSize=4M1M,led=2,LwIPVariant=v2mss536,Debug=Serial,DebugLevel=CORE --save-prefs # - build_examples - - arduino --board espressif:esp32:NodeMCU-32S:FlashFreq=80 --save-prefs + - arduino --board espressif:esp32:esp32doit-devkit-v1:FlashFreq=80,DebugLevel=info --save-prefs # some examples fail (SPIFFS defines differ esp32 vs esp8266) so we exclude them - excludes=("AutoConnectWithFSParametersAndCustomIP.ino" "AutoConnectWithFSParameters.ino") - build_examples "${excludes[@]}" From 5eea21afa90ce9645a7df9363fe11486bc6f6fa6 Mon Sep 17 00:00:00 2001 From: Chris Liebman Date: Tue, 20 Mar 2018 13:17:09 -0700 Subject: [PATCH 12/13] add esp32 --- .travis.yml | 11 +++++++---- travis/common.sh | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index f4b056e..86fddf3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,16 +32,19 @@ script: - "echo $HOME" - "ls $PWD" - source $TRAVIS_BUILD_DIR/travis/common.sh -# - arduino --board esp8266:esp8266:generic:CpuFrequency=80,CrystalFreq=26,FlashFreq=40,FlashMode=qio,FlashSize=4M1M,led=2,LwIPVariant=v2mss536,Debug=Serial,DebugLevel=CORE --save-prefs -# - build_examples + - arduino --board esp8266:esp8266:generic:CpuFrequency=80,CrystalFreq=26,FlashFreq=40,FlashMode=qio,FlashSize=4M1M,led=2,LwIPVariant=v2mss536,Debug=Serial,DebugLevel=CORE --save-prefs + - build_examples - arduino --board espressif:esp32:esp32doit-devkit-v1:FlashFreq=80,DebugLevel=info --save-prefs # some examples fail (SPIFFS defines differ esp32 vs esp8266) so we exclude them - excludes=("AutoConnectWithFSParametersAndCustomIP.ino" "AutoConnectWithFSParameters.ino") - build_examples "${excludes[@]}" # - arduino -v --verbose-build --verify $PWD/examples/AutoConnect/AutoConnect.ino -after_success: - - bash <(curl -s https://codecov.io/bash) +# no coverage generated, no need to run +# +#after_success: +# - bash <(curl -s https://codecov.io/bash) + notifications: email: on_success: change diff --git a/travis/common.sh b/travis/common.sh index 6f0badf..4b3e655 100644 --- a/travis/common.sh +++ b/travis/common.sh @@ -23,7 +23,7 @@ function build_examples() # skip files listed as excludes for exclude in "${excludes[@]}"; do if [ "${example_file}" == "${exclude}" ] ; then - echo "Skipping ${example_file}!" + echo ">>>>>>>>>>>>>>>>>>>>>>>> Skipping ${example_file} <<<<<<<<<<<<<<<<<<<<<<<<<<" continue 2 fi done From 56d3e6d7374f3fe6ef7e5029a17d3ac9f7744b38 Mon Sep 17 00:00:00 2001 From: Chris Liebman Date: Tue, 20 Mar 2018 13:47:28 -0700 Subject: [PATCH 13/13] make travis build again --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 86fddf3..97d018f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,7 @@ before_install: - tar xf arduino-1.8.5-linux64.tar.xz - sudo mv arduino-1.8.5 /usr/local/share/arduino - sudo ln -s /usr/local/share/arduino/arduino /usr/local/bin/arduino + install: - ln -s $PWD /usr/local/share/arduino/libraries/WiFiManager - arduino --pref "boardsmanager.additional.urls=http://arduino.esp8266.com/stable/package_esp8266com_index.json" --save-prefs @@ -27,6 +28,7 @@ install: - popd # esp32 needs WebServer_tng for now - git clone https://github.com/bbx10/WebServer_tng.git /usr/local/share/arduino/libraries/WebServer_tng + script: - "echo $PWD" - "echo $HOME"