Skip to content

Commit

Permalink
travis by compiler cache needs to use language:cpp
Browse files Browse the repository at this point in the history
  • Loading branch information
Dane Springmeyer committed May 9, 2016
1 parent 609e5ba commit 83768dc
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions .travis.yml
@@ -1,4 +1,4 @@
language: generic
language: cpp

git:
depth: 10
Expand All @@ -25,15 +25,15 @@ matrix:
- os: linux
sudo: false
compiler: ": clang"
env: JOBS=8 MASON_PUBLISH=true CXX="ccache clang++-3.5 -Qunused-arguments" CC="clang-3.5" TRIGGER=true
env: JOBS=8 MASON_PUBLISH=true _CXX="ccache clang++-3.5 -Qunused-arguments" _CC="clang-3.5" TRIGGER=true
addons:
apt:
sources: [ 'ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.5' ]
packages: [ 'clang-3.5' ]
- os: linux
sudo: false
compiler: ": clang-coverage"
env: JOBS=8 COVERAGE=true LLVM_VERSION="3.5" CXX="ccache clang++-3.5 -Qunused-arguments" CC="clang-3.5"
env: JOBS=8 COVERAGE=true LLVM_VERSION="3.5" _CXX="ccache clang++-3.5 -Qunused-arguments" _CC="clang-3.5"
addons:
apt:
sources: [ 'ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.5' ]
Expand All @@ -42,9 +42,11 @@ matrix:
compiler: ": clang-osx"
# https://docs.travis-ci.com/user/languages/objective-c/#Supported-OS-X-iOS-SDK-versions
osx_image: xcode7.3 # upgrades clang from 6 -> 7
env: JOBS=4 MASON_PUBLISH=true CXX="ccache clang++ -Qunused-arguments"
env: JOBS=4 MASON_PUBLISH=true _CXX="ccache clang++ -Qunused-arguments"

before_install:
- if [[ ${_CXX:-false} != false ]]; then export CXX=${_CXX}; fi
- if [[ ${_CC:-false} != false ]]; then export CC=${_CC}; fi
- source scripts/travis-common.sh
- export PYTHONUSERBASE=$(pwd)/mason_packages/.link
- export PATH=${PREFIX}/bin:$(pwd)/mason_packages/.link/bin:${PYTHONUSERBASE}/bin:${PATH}
Expand Down

0 comments on commit 83768dc

Please sign in to comment.