diff --git a/.travis.yml b/.travis.yml index 27f687d339b89e5dde4c29125f3082494e9f9dd7..e3182569c4213e91fc4edb7affd6338d7603d44c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -238,14 +238,10 @@ before_install: #sudo apt-get install -qq -y clang-3.7 libclang-common-3.7-dev libclang-3.7-dev libclang1-3.7 libllvm3.7 lldb-3.7 llvm-3.7 llvm-3.7-dev llvm-3.7-runtime clang-modernize-3.7 clang-format-3.7 lldb-3.7-dev # OSX elif [[ ${TRAVIS_OS_NAME} == "osx" ]]; then - # xpath install is based on http://lewandowski.io/2015/01/sed-xpath/ - brew tap concept-not-found/tap brew update brew outdated boost || brew upgrade boost brew outdated cmake || brew upgrade cmake - brew install lcov xpath homebrew/science/opencv - mv /usr/local/bin/xpath /usr/local/bin/osx.xpath - sudo ln -s /usr/local/Cellar/xpath/1.13-7/bin/xpath /usr/local/bin/xpath + brew install lcov homebrew/science/opencv fi - gem install coveralls-lcov - if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi diff --git a/.travis/codacy-install.sh b/.travis/codacy-install.sh index 32345de384a2a35760e488dd43b903fc88d6a31e..5d0afd90f1cf7dc9a127e8b63f63fdc0252520ee 100755 --- a/.travis/codacy-install.sh +++ b/.travis/codacy-install.sh @@ -1,6 +1,11 @@ #!/usr/bin/env bash -# get latest version of codacy reporter from sonatype -latest=$(curl "https://oss.sonatype.org/service/local/repositories/releases/content/com/codacy/codacy-coverage-reporter/maven-metadata.xml" | xpath -e "/metadata/versioning/release/text()") +if [[ ${TRAVIS_OS_NAME} == "osx" ]]; then + # Xpath doesn't work on OSX, so use a hard-coded version number + latest="4.0.1" +else + # get latest version of codacy reporter from sonatype + latest=$(curl "https://oss.sonatype.org/service/local/repositories/releases/content/com/codacy/codacy-coverage-reporter/maven-metadata.xml" | xpath -e "/metadata/versioning/release/text()") +fi echo Downloading latest version $latest of codacy reporter from sonatype # download laterst assembly jar