diff --git a/.travis b/.travis index bad6dbd..dc8b946 160000 --- a/.travis +++ b/.travis @@ -1 +1 @@ -Subproject commit bad6dbd29cf70e852e5e427e876390d954ca7d6b +Subproject commit dc8b946d456d2c41ad12b819111b005148c68031 diff --git a/.travis.yml b/.travis.yml index e18b0f9..a9e5cc5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ language: cpp env: global: - APT_DEPENDENCIES="cmake cmake-data doxygen libltdl-dev libboost-all-dev liblog4cxx10-dev" - - HOMEBREW_DEPENDENCIES="doxygen log4cxx ipopt openblas mumps" + - HOMEBREW_DEPENDENCIES="doxygen log4cxx brewsci/science/ipopt openblas mumps" - GIT_DEPENDENCIES="roboptim/roboptim-core" - DEBSIGN_KEYID=5AE5CD75 - PPA_URI="roboptim/ppa" @@ -33,12 +33,12 @@ script: - if [ "${COVERITY_SCAN_BRANCH}" != "1" ]; then ./.travis/run build; fi after_success: - ./.travis/run after_success - - codecov --gcov-root=/tmp/_ci/build + - if [ "${TRAVIS_OS_NAME}" == "linux" ]; then codecov --gcov-root=/tmp/_ci/build; fi after_failure: ./.travis/run after_failure before_install: # Avoid bug on CI with OSX, see https://github.com/travis-ci/travis-ci/issues/8552 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi - - pip install --user codecov + - if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then pip install --user codecov; fi - ./.travis/dependencies/eigen-${EIGEN_MAJOR} - ./.travis/run before_install - if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then CC=gcc CXX=g++ ./.travis/dependencies/ipopt; fi @@ -49,6 +49,8 @@ matrix: compiler: clang - os: osx compiler: gcc + - os: osx + compiler: clang - env: COVERITY_SCAN_BRANCH=1 include: - os: linux