sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use clang 3.9, g++-6

Browse source
This commit is contained in:
Dane Springmeyer 2016-11-29 12:03:34 -08:00
parent 5ea5f18a7e
commit e57ac30690
1 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
.travis.yml
View file

@ -25,19 +25,29 @@ matrix:
- os: linux - os: linux
sudo: false sudo: false
compiler: ": clang" compiler: ": clang"
env: JOBS=8 MASON_PUBLISH=true CXX="ccache clang++-3.8 -Qunused-arguments" CC="clang-3.8" TRIGGER=true sudo: required
dist: trusty
env: JOBS=4 CXX="ccache g++-6" CC="gcc-6"
addons: addons:
apt: apt:
sources: [ 'ubuntu-toolchain-r-test'] sources: [ 'ubuntu-toolchain-r-test']
packages: [ 'libstdc++-5-dev', 'xutils-dev'] packages: [ 'libstdc++-6-dev', 'g++-6', 'xutils-dev']
- os: linux
sudo: false
compiler: ": clang"
env: JOBS=8 MASON_PUBLISH=true CXX="ccache clang++-3.9 -Qunused-arguments" CC="clang-3.9" TRIGGER=true
addons:
apt:
sources: [ 'ubuntu-toolchain-r-test']
packages: [ 'libstdc++-4.9-dev', 'xutils-dev']
- os: linux - os: linux
sudo: false sudo: false
compiler: ": clang-coverage" compiler: ": clang-coverage"
env: JOBS=8 COVERAGE=true CXX="ccache clang++-3.8 -Qunused-arguments" CC="clang-3.8" env: JOBS=8 COVERAGE=true CXX="ccache clang++-3.9 -Qunused-arguments" CC="clang-3.9"
addons: addons:
apt: apt:
sources: [ 'ubuntu-toolchain-r-test'] sources: [ 'ubuntu-toolchain-r-test']
packages: ['libstdc++-5-dev', 'xutils-dev' ] packages: ['libstdc++-4.9-dev', 'xutils-dev' ]
- os: osx - os: osx
compiler: ": clang-osx" compiler: ": clang-osx"
# https://docs.travis-ci.com/user/languages/objective-c/#Supported-OS-X-iOS-SDK-versions # https://docs.travis-ci.com/user/languages/objective-c/#Supported-OS-X-iOS-SDK-versions
@ -78,10 +88,12 @@ before_script:
- source bootstrap.sh - source bootstrap.sh
- | - |
if [[ $(uname -s) == 'Linux' ]]; then if [[ $(uname -s) == 'Linux' ]]; then
mason install clang 3.8.0 mason install clang++ 3.9.0
export PATH=$(mason prefix clang 3.8.0)/bin:${PATH} export PATH=$(mason prefix clang++ 3.9.0)/bin:${PATH}
which clang++ mason install llvm-cov 3.9.0
export LLVM_COV="$(mason prefix clang 3.8.0)/bin/llvm-cov" export PATH=$(mason prefix llvm-cov 3.9.0)/bin:${PATH}
which llvm-cov
export LLVM_COV="$(mason prefix llvm-cov 3.9.0)/bin/llvm-cov"
fi fi
- ccache --version - ccache --version
- ccache -p || true - ccache -p || true