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

[travis] switch coverage run to linux - closes #3344

Browse source
This commit is contained in:
Dane Springmeyer 2016-03-04 11:29:05 -08:00
parent 71af6a8fe3
commit f90cef44c3
2 changed files with 13 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
.travis.yml
View file

@ -1,23 +1,16 @@
language: c language: c
sudo: false
git: git:
depth: 10 depth: 10
submodules: false submodules: false
env: env:
global: global:
- HEAVY_JOBS: "2"
- secure: "N3a5nzzsgpuu45k8qWdYsHNxrSnqeAGLTOYpfYoAH7B94vuf7pa7XV1tQjXbxrnx2D6ryTdtUtyRKwy7zXbwXxGt4DpczWEo8f6DUd6+obAp3kdnXABg2Sj4oA7KMs0F0CmoADy0jdUZD5YyOJHu64LCIIgzEQ9q49PFMNbU3IE=" - secure: "N3a5nzzsgpuu45k8qWdYsHNxrSnqeAGLTOYpfYoAH7B94vuf7pa7XV1tQjXbxrnx2D6ryTdtUtyRKwy7zXbwXxGt4DpczWEo8f6DUd6+obAp3kdnXABg2Sj4oA7KMs0F0CmoADy0jdUZD5YyOJHu64LCIIgzEQ9q49PFMNbU3IE="
- secure: "iQYPNpMtejcgYeUkWZGIWz1msIco5qydJrhZTSCQOYahAQerdT7q5WZEpEo3G6IWOGgO1eo7GFuY8DvqQjw1+jC9b9mhkRNdo3LhGTKS9Gsbl5Q27k0rjlaFZmmQHrfPlQJwhfAIp+KLugHtQw5bCoLh+95E3j0F0DayF1tuJ3s=" - secure: "iQYPNpMtejcgYeUkWZGIWz1msIco5qydJrhZTSCQOYahAQerdT7q5WZEpEo3G6IWOGgO1eo7GFuY8DvqQjw1+jC9b9mhkRNdo3LhGTKS9Gsbl5Q27k0rjlaFZmmQHrfPlQJwhfAIp+KLugHtQw5bCoLh+95E3j0F0DayF1tuJ3s="
addons: addons:
postgresql: "9.4" postgresql: "9.4"
apt:
sources:
- ubuntu-toolchain-r-test
- llvm-toolchain-precise-3.5
packages:
- clang-3.5
cache: cache:
directories: directories:
@ -26,30 +19,26 @@ cache:
matrix: matrix:
include: include:
- os: linux - os: linux
sudo: false
compiler: clang compiler: clang
env: JOBS=8 CXX="ccache clang++-3.5 -Qunused-arguments" CC="clang-3.5" MASON_PUBLISH=true BENCH=True env: JOBS=8 MASON_PUBLISH=true CXX="ccache clang++-3.5 -Qunused-arguments" CC="clang-3.5" BENCH=True
addons: addons:
apt: apt:
sources: [ 'ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.5' ] sources: [ 'ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.5' ]
packages: [ 'clang-3.5' ] packages: [ 'clang-3.5' ]
# OOM killer knocking out build on render_markers_symbolizer.cpp - os: linux
# sudo: false
#- os: linux compiler: clang
# compiler: gcc env: JOBS=8 COVERAGE=true LLVM_VERSION="3.5" CXX="ccache clang++-3.5 -Qunused-arguments" CC="clang-3.5"
# env: JOBS=6 CXX="ccache g++-4.9" CC="gcc-4.9" addons:
# addons: apt:
# apt: sources: [ 'ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.5' ]
# sources: [ 'ubuntu-toolchain-r-test' ] packages: [ 'clang-3.5', 'llvm-3.5-dev' ]
# packages: [ 'gcc-4.9', 'g++-4.9', 'libstdc++-4.9-dev', 'libstdc++6' ]
- os: osx - os: osx
compiler: clang compiler: clang
# 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
osx_image: xcode7.3 # upgrades clang from 6 -> 7 osx_image: xcode7.3 # upgrades clang from 6 -> 7
env: JOBS=4 MASON_PUBLISH=true HEAVY_JOBS=2 env: JOBS=4 MASON_PUBLISH=true
- os: osx
compiler: clang
osx_image: xcode7.3 # upgrades clang from 6 -> 7
env: JOBS=4 COVERAGE=true HEAVY_JOBS=2
before_install: before_install:
- source scripts/travis-common.sh - source scripts/travis-common.sh

1
scripts/travis-common.sh
View file

@ -100,6 +100,7 @@ configure () {
coverage () { coverage () {
./mason_packages/.link/bin/cpp-coveralls \ ./mason_packages/.link/bin/cpp-coveralls \
--gcov /usr/bin/llvm-cov-${LLVM_VERSION} \
--build-root . --gcov-options '\-lp' \ --build-root . --gcov-options '\-lp' \
--exclude mason_packages \ --exclude mason_packages \
--exclude .sconf_temp --exclude benchmark --exclude deps \ --exclude .sconf_temp --exclude benchmark --exclude deps \