Skip to content

Commit

Permalink
Merge 10fc3fc into d5c597d
Browse files Browse the repository at this point in the history
  • Loading branch information
bchretien committed Jul 30, 2018
2 parents d5c597d + 10fc3fc commit b4d0c0b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .travis
Submodule .travis updated 1 files
+0 −2 before_install
8 changes: 5 additions & 3 deletions .travis.yml
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand All @@ -49,6 +49,8 @@ matrix:
compiler: clang
- os: osx
compiler: gcc
- os: osx
compiler: clang
- env: COVERITY_SCAN_BRANCH=1
include:
- os: linux
Expand Down

0 comments on commit b4d0c0b

Please sign in to comment.