From 5a1bd55af0e81cd6f3959fa070b6b1c60ad6c884 Mon Sep 17 00:00:00 2001 From: Timor Gruber Date: Fri, 14 Sep 2018 15:39:57 +0300 Subject: [PATCH 1/8] Fixed CMake's run path in 'travis' config file. --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e87a628..3368c0a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,7 +36,7 @@ install: - rm -rf build/* - cd build/ script: -- cmake -D CMAKE_TOOLCHAIN_FILE="../cmake/Arduino-Toolchain.cmake" .. +- cmake -D CMAKE_TOOLCHAIN_FILE="../cmake/Arduino-Toolchain.cmake" ../examples - make -after_script: +after_success: - cat CMakeFiles/CMakeOutput.log From b2ca2e953ac18d0fa08b665b668038c6d36e65bc Mon Sep 17 00:00:00 2001 From: Timor Gruber Date: Fri, 14 Sep 2018 15:50:15 +0300 Subject: [PATCH 2/8] Fixed problem with OS X - Builds failed because CMake was already installed. --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3368c0a..b1e3556 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,6 @@ env: addons: apt: packages: - - gcc-avr - binutils-avr - avr-libc - avrdude @@ -19,7 +18,7 @@ before_install: export ARDUINO_SDK_FILE="arduino-$ARDUINO_SDK_VERSION-linux32.tar.xz" else export ARDUINO_SDK_FILE="arduino-$ARDUINO_SDK_VERSION-macosx.zip" - brew install cmake + brew upgrade cmake fi - wget "https://downloads.arduino.cc/$ARDUINO_SDK_FILE" -O "$ARDUINO_SDK_FILE" - mkdir arduino-sdk @@ -38,5 +37,5 @@ install: script: - cmake -D CMAKE_TOOLCHAIN_FILE="../cmake/Arduino-Toolchain.cmake" ../examples - make -after_success: +after_failure: - cat CMakeFiles/CMakeOutput.log From a684a597e69e0fc5f23aa19162d21b1104d636d9 Mon Sep 17 00:00:00 2001 From: Timor Gruber Date: Fri, 14 Sep 2018 16:20:38 +0300 Subject: [PATCH 3/8] Added some more diagnostics for failed 'travis' builds --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b1e3556..cb6f9c1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,7 @@ before_install: - | if [[ $TRAVIS_OS_NAME == linux ]]; then tar xf "$ARDUINO_SDK_FILE" -C arduino-sdk --strip-components 1 - export ARDUINO_SDK_PATH="$(pwd)/arduino-sdk" + export ARDUINO_SDK_PATH="$PWD/arduino-sdk" else unzip "$ARDUINO_SDK_FILE" "Arduino.app/Contents/Java/*" -d arduino-sdk export ARDUINO_SDK_PATH="$(pwd)/arduino-sdk/Arduino.app/Contents/Java" @@ -38,4 +38,5 @@ script: - cmake -D CMAKE_TOOLCHAIN_FILE="../cmake/Arduino-Toolchain.cmake" ../examples - make after_failure: +- ls -lR $ARDUNIO_SDK_PATH - cat CMakeFiles/CMakeOutput.log From 1ef11f2096604d493c8138e2cf145c3180623b85 Mon Sep 17 00:00:00 2001 From: Timor Gruber Date: Fri, 14 Sep 2018 16:20:38 +0300 Subject: [PATCH 4/8] Added some more diagnostics for failed 'travis' builds --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index cb6f9c1..996d57d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,6 +18,7 @@ before_install: export ARDUINO_SDK_FILE="arduino-$ARDUINO_SDK_VERSION-linux32.tar.xz" else export ARDUINO_SDK_FILE="arduino-$ARDUINO_SDK_VERSION-macosx.zip" + brew update brew upgrade cmake fi - wget "https://downloads.arduino.cc/$ARDUINO_SDK_FILE" -O "$ARDUINO_SDK_FILE" @@ -38,5 +39,5 @@ script: - cmake -D CMAKE_TOOLCHAIN_FILE="../cmake/Arduino-Toolchain.cmake" ../examples - make after_failure: -- ls -lR $ARDUNIO_SDK_PATH +- ls -lR $ARDUINO_SDK_PATH - cat CMakeFiles/CMakeOutput.log From ec96b0c441854449503076586da06a80fba5e9a7 Mon Sep 17 00:00:00 2001 From: Timor Gruber Date: Fri, 14 Sep 2018 16:43:35 +0300 Subject: [PATCH 5/8] Fixed Arduino SDK download url for Linux in 'travis', was 32-bit instead of 64. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 996d57d..c5b3150 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ addons: before_install: - | if [[ $TRAVIS_OS_NAME == linux ]]; then - export ARDUINO_SDK_FILE="arduino-$ARDUINO_SDK_VERSION-linux32.tar.xz" + export ARDUINO_SDK_FILE="arduino-$ARDUINO_SDK_VERSION-linux64.tar.xz" else export ARDUINO_SDK_FILE="arduino-$ARDUINO_SDK_VERSION-macosx.zip" brew update From 97798a6c4bea930675f205129db99433e1c7a312 Mon Sep 17 00:00:00 2001 From: Timor Gruber Date: Fri, 14 Sep 2018 20:07:06 +0300 Subject: [PATCH 6/8] Added 'Travis-CI' badge status to 'Readme'. --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index f87dc85..d9b84e5 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ # Arduino-CMake NG [![AppVeyor Build](https://ci.appveyor.com/api/projects/status/github/arduino-cmake/Arduino-CMake-NG?svg=true&passingText=Windows%20-%20Passing&failingText=Windows%20-%20Failing&pendingText=Windows%20-%20Pending)](https://ci.appveyor.com/project/arduino-cmake/arduino-cmake-ng) +[![Travis CI](https://img.shields.io/travis/arduino-cmake/Arduino-CMake-NG/branch=develop.svg?label=Linux and OS X &logo=travis)](https://travis-ci.org/arduino-cmake/Arduino-CMake-NG) **Arduino-CMake** is a framework which allows developers to write Arduino-based programs using any tool that supports cmake. *Arduino-based*? There are many other frameworks out there built upon Arduino's base, such as ESP32, and **we support that**. In other words, developers can use their favorite IDEs or text editors on their favorite OS to develop Arduino programs! From bcfe1f2cfd26480e068c8604b4d959e155cddd63 Mon Sep 17 00:00:00 2001 From: Timor Gruber Date: Sat, 15 Sep 2018 13:54:33 +0300 Subject: [PATCH 7/8] Removed any 'brew' actions for OS X images in 'travis'. All required dependencies are currently met, so the time-consuming 'brew' actions such as 'update' and 'upgrade' are not required. Also removed output of Arduino SDK's directory contents on failed builds. --- .travis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index c5b3150..7f9ba23 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,8 +18,6 @@ before_install: export ARDUINO_SDK_FILE="arduino-$ARDUINO_SDK_VERSION-linux64.tar.xz" else export ARDUINO_SDK_FILE="arduino-$ARDUINO_SDK_VERSION-macosx.zip" - brew update - brew upgrade cmake fi - wget "https://downloads.arduino.cc/$ARDUINO_SDK_FILE" -O "$ARDUINO_SDK_FILE" - mkdir arduino-sdk @@ -39,5 +37,4 @@ script: - cmake -D CMAKE_TOOLCHAIN_FILE="../cmake/Arduino-Toolchain.cmake" ../examples - make after_failure: -- ls -lR $ARDUINO_SDK_PATH - cat CMakeFiles/CMakeOutput.log From 7710a8e2cc4ca3b96810f4ea4742e32388a56df9 Mon Sep 17 00:00:00 2001 From: Timor Gruber Date: Sat, 15 Sep 2018 17:14:11 +0300 Subject: [PATCH 8/8] Added check to ignore builds triggered by the 'feature/appveyor' branch in 'travis'. --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 7f9ba23..d9b48e0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,7 @@ os: env: - ARDUINO_SDK_VERSION=1.6.10 - ARDUINO_SDK_VERSION=1.8.7 +if: branch != feature/appveyor-ci addons: apt: packages: