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

travis: switch to trusty, tweaks from master

Browse source
This commit is contained in:
Mickey Rose 2018-08-25 11:57:24 +02:00
parent 5531dad9ea
commit fd0ed46225
2 changed files with 25 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
.travis.yml
View file

@ -11,43 +11,42 @@ env:
- HEAVY_JOBS="2" - HEAVY_JOBS="2"
- PREFIX=/tmp/mapnik - PREFIX=/tmp/mapnik
- secure: "F6ivqDNMBQQnrDGA9+7IX+GDswuIqQQd7YPJdQqa2Ked9jddAQDeJClb05ig3JlwfOlYLGZOd43ZX0pKuMtI2Gbkwz211agGP9S3YunwlRg8iWtJlO5kYFUdKCmJNhjg4icfkGELCgwXn+zuEWFSLpkPcjqAFKFlQrIJeAJJgKM=" - secure: "F6ivqDNMBQQnrDGA9+7IX+GDswuIqQQd7YPJdQqa2Ked9jddAQDeJClb05ig3JlwfOlYLGZOd43ZX0pKuMtI2Gbkwz211agGP9S3YunwlRg8iWtJlO5kYFUdKCmJNhjg4icfkGELCgwXn+zuEWFSLpkPcjqAFKFlQrIJeAJJgKM="
addons:
postgresql: "9.4"
cache: cache:
directories: directories:
- $HOME/.ccache - $HOME/.ccache
dist: precise dist: trusty
sudo: false
matrix: matrix:
include: include:
- os: linux - os: linux
sudo: false name: Linux gcc-6
compiler: ": clang"
env: JOBS=4 CXX="ccache g++-6" CC="gcc-6" env: JOBS=4 CXX="ccache g++-6" CC="gcc-6"
addons: addons:
postgresql: "9.4"
apt: apt:
sources: [ 'ubuntu-toolchain-r-test'] sources: [ 'ubuntu-toolchain-r-test']
packages: [ 'libstdc++-6-dev', 'g++-6', 'xutils-dev'] packages: [ 'libstdc++-6-dev', 'g++-6', 'xutils-dev', 'postgresql-9.4-postgis-2.3' ]
- os: linux - os: linux
sudo: false name: Linux clang-3.9
compiler: ": clang"
env: JOBS=8 CXX="ccache clang++-3.9 -Qunused-arguments" CC="clang-3.9" ENABLE_GLIBC_WORKAROUND=true TRIGGER=true env: JOBS=8 CXX="ccache clang++-3.9 -Qunused-arguments" CC="clang-3.9" ENABLE_GLIBC_WORKAROUND=true TRIGGER=true
addons: addons:
postgresql: "9.4"
apt: apt:
sources: [ 'ubuntu-toolchain-r-test'] sources: [ 'ubuntu-toolchain-r-test' ]
packages: [ 'libstdc++-4.9-dev', 'xutils-dev'] packages: [ 'libstdc++-4.9-dev', 'xutils-dev', 'postgresql-9.4-postgis-2.3' ]
- os: linux - os: linux
sudo: false name: Linux clang-3.9 + coverage
compiler: ": clang-coverage"
env: JOBS=8 COVERAGE=true CXX="ccache clang++-3.9 -Qunused-arguments" CC="clang-3.9" env: JOBS=8 COVERAGE=true CXX="ccache clang++-3.9 -Qunused-arguments" CC="clang-3.9"
addons: addons:
postgresql: "9.4"
apt: apt:
sources: [ 'ubuntu-toolchain-r-test'] sources: [ 'ubuntu-toolchain-r-test' ]
packages: ['libstdc++-4.9-dev', 'xutils-dev' ] packages: ['libstdc++-4.9-dev', 'xutils-dev', 'postgresql-9.4-postgis-2.3' ]
- os: osx - os: osx
compiler: ": clang-osx" name: OSX 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 CXX="ccache clang++ -Qunused-arguments" env: JOBS=4 CXX="ccache clang++ -Qunused-arguments"
@ -63,7 +62,7 @@ before_install:
- export PATH=${PREFIX}/bin:$(pwd)/mason_packages/.link/bin:${PATH} - export PATH=${PREFIX}/bin:$(pwd)/mason_packages/.link/bin:${PATH}
- export COVERAGE=${COVERAGE:-false} - export COVERAGE=${COVERAGE:-false}
- export BENCH=${BENCH:-false} - export BENCH=${BENCH:-false}
- git_submodule_update --init - git_submodule_update --init deps/
install: install:
- on 'osx' export DATA_PATH=$(brew --prefix)/var/postgres - on 'osx' export DATA_PATH=$(brew --prefix)/var/postgres
@ -101,11 +100,12 @@ script:
# to ensure that slow builds still upload their # to ensure that slow builds still upload their
# ccache results and therefore should be faster # ccache results and therefore should be faster
# (and might work) for the next build # (and might work) for the next build
- DURATION=2400 - DEADLINE=$(( $(date +%s) + 40 * 60 ))
- scripts/travis-command-wrapper.py -s "date" -i 120 --deadline=$(( $(date +%s) + ${DURATION} )) make - scripts/travis-command-wrapper.py -s "date" -i 120 --deadline="$DEADLINE" make
- make test - test_ok && git_submodule_update --init test/
- enabled ${COVERAGE} coverage - test_ok && make test
- enabled ${BENCH} make bench - test_ok && enabled ${COVERAGE} coverage
- test_ok && enabled ${BENCH} make bench
- ./scripts/check_glibcxx.sh - ./scripts/check_glibcxx.sh
after_success: after_success:

4
scripts/travis-common.sh
View file

@ -28,6 +28,10 @@ on () {
esac esac
} }
test_ok () {
return $TRAVIS_TEST_RESULT
}
git_submodule_update () { git_submodule_update () {
git submodule update "$@" && return git submodule update "$@" && return
# failed, search branch and pull request heads for matching commit # failed, search branch and pull request heads for matching commit