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

Merge pull request #4199 from mapnik/travis

Browse source 
upgrade dist+toolchain
This commit is contained in:
Artem Pavlenko 2020-12-16 14:25:13 +00:00 committed by GitHub
commit cb4f1ff63a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
.travis.yml
View file

@ -15,48 +15,34 @@ cache:
directories:
- $HOME/.ccache
dist: trusty
dist: xenial
matrix:
include:
#- os: linux
# name: Linux gcc-6
# env: >-
# CXX="ccache g++-6"
# CC="gcc-6"
# addons:
# postgresql: "9.5"
# apt:
# sources: [ 'ubuntu-toolchain-r-test']
# packages: [ 'libstdc++-6-dev', 'g++-6', 'xutils-dev', 'postgresql-9.5-postgis-2.3' ]
- os: linux
name: Linux clang-3.9
name: Linux clang
env: >-
CXX="ccache clang++-3.9 -Qunused-arguments"
CC="clang-3.9"
ENABLE_GLIBC_WORKAROUND=true
before_install:
- export LINKFLAGS="-fuse-ld=gold-2.26"
CXX="ccache clang++ -Qunused-arguments"
CC="clang"
addons:
postgresql: "9.5"
apt:
sources: [ 'ubuntu-toolchain-r-test' ]
packages: [ 'clang-3.9', 'libstdc++-4.9-dev', 'xutils-dev', 'postgresql-9.5-postgis-2.3' ]
packages: [ 'xutils-dev', 'postgresql-9.5-postgis-2.4' ]
- os: linux
name: Linux clang-3.9 + coverage
name: Linux clang + coverage
env: >-
CXX="ccache clang++-3.9 -Qunused-arguments"
CC="clang-3.9"
CXX="ccache clang++ -Qunused-arguments"
CC="clang"
COVERAGE=true
QUIET=true
before_install:
- export LINKFLAGS="-fuse-ld=gold-2.26"
- export LLVM_COV="llvm-cov-3.9"
- export LLVM_COV="llvm-cov"
addons:
postgresql: "9.5"
apt:
sources: [ 'ubuntu-toolchain-r-test' ]
packages: [ 'clang-3.9', 'llvm-3.9', 'libstdc++-4.9-dev', 'xutils-dev', 'postgresql-9.5-postgis-2.3' ]
packages: [ 'xutils-dev', 'postgresql-9.5-postgis-2.4' ]
- os: osx
name: OSX clang
# https://docs.travis-ci.com/user/languages/objective-c/#Supported-OS-X-iOS-SDK-versions

6
bootstrap.sh
View file

@ -43,8 +43,8 @@ function install() {
mason link $1 $2
}
ICU_VERSION="58.1"
BOOST_VERSION="1.74.0"
ICU_VERSION="57.1"
BOOST_VERSION="1.73.0"
function install_mason_deps() {
install ccache 3.3.1
@ -65,7 +65,7 @@ function install_mason_deps() {
install boost_libsystem ${BOOST_VERSION}
install boost_libfilesystem ${BOOST_VERSION}
install boost_libprogram_options ${BOOST_VERSION}
install boost_libregex_icu58 ${BOOST_VERSION}
install boost_libregex_icu57 ${BOOST_VERSION}
# technically boost thread and python are not a core dep, but installing
# here by default helps make python-mapnik builds easier
install boost_libthread ${BOOST_VERSION}