diff --git a/.travis.yml b/.travis.yml index e87a628..d9b48e0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,10 +5,10 @@ os: env: - ARDUINO_SDK_VERSION=1.6.10 - ARDUINO_SDK_VERSION=1.8.7 +if: branch != feature/appveyor-ci addons: apt: packages: - - gcc-avr - binutils-avr - avr-libc - avrdude @@ -16,17 +16,16 @@ 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 install cmake fi - wget "https://downloads.arduino.cc/$ARDUINO_SDK_FILE" -O "$ARDUINO_SDK_FILE" - mkdir arduino-sdk - | 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" @@ -36,7 +35,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_failure: - cat CMakeFiles/CMakeOutput.log 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!