upgrade dist+toolchain
This commit is contained in:
parent
7520e16340
commit
6f36340888
1 changed files with 12 additions and 28 deletions
40
.travis.yml
40
.travis.yml
|
@ -1,5 +1,7 @@
|
||||||
language: generic
|
language: generic
|
||||||
|
|
||||||
|
dist: xenial
|
||||||
|
|
||||||
git:
|
git:
|
||||||
depth: 10
|
depth: 10
|
||||||
submodules: false
|
submodules: false
|
||||||
|
@ -15,48 +17,30 @@ cache:
|
||||||
directories:
|
directories:
|
||||||
- $HOME/.ccache
|
- $HOME/.ccache
|
||||||
|
|
||||||
dist: trusty
|
|
||||||
|
|
||||||
matrix:
|
matrix:
|
||||||
include:
|
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
|
- os: linux
|
||||||
name: Linux clang-3.9
|
name: Linux clang
|
||||||
env: >-
|
env: >-
|
||||||
CXX="ccache clang++-3.9 -Qunused-arguments"
|
CXX="ccache clang++ -Qunused-arguments"
|
||||||
CC="clang-3.9"
|
CC="clang"
|
||||||
ENABLE_GLIBC_WORKAROUND=true
|
ENABLE_GLIBC_WORKAROUND=false
|
||||||
before_install:
|
|
||||||
- export LINKFLAGS="-fuse-ld=gold-2.26"
|
|
||||||
addons:
|
addons:
|
||||||
postgresql: "9.5"
|
postgresql: "9.5"
|
||||||
apt:
|
apt:
|
||||||
sources: [ 'ubuntu-toolchain-r-test' ]
|
packages: [ 'xutils-dev', 'postgresql-9.5-postgis-2.3' ]
|
||||||
packages: [ 'clang-3.9', 'libstdc++-4.9-dev', 'xutils-dev', 'postgresql-9.5-postgis-2.3' ]
|
|
||||||
- os: linux
|
- os: linux
|
||||||
name: Linux clang-3.9 + coverage
|
name: Linux clang + coverage
|
||||||
env: >-
|
env: >-
|
||||||
CXX="ccache clang++-3.9 -Qunused-arguments"
|
CXX="ccache clang++ -Qunused-arguments"
|
||||||
CC="clang-3.9"
|
CC="clang"
|
||||||
COVERAGE=true
|
COVERAGE=true
|
||||||
QUIET=true
|
QUIET=true
|
||||||
before_install:
|
before_install:
|
||||||
- export LINKFLAGS="-fuse-ld=gold-2.26"
|
- export LLVM_COV="llvm-cov"
|
||||||
- export LLVM_COV="llvm-cov-3.9"
|
|
||||||
addons:
|
addons:
|
||||||
postgresql: "9.5"
|
postgresql: "9.5"
|
||||||
apt:
|
packages: [ 'xutils-dev', 'postgresql-9.5-postgis-2.3' ]
|
||||||
sources: [ 'ubuntu-toolchain-r-test' ]
|
|
||||||
packages: [ 'clang-3.9', 'llvm-3.9', 'libstdc++-4.9-dev', 'xutils-dev', 'postgresql-9.5-postgis-2.3' ]
|
|
||||||
- os: osx
|
- os: osx
|
||||||
name: OSX clang
|
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
|
||||||
|
|
Loading…
Reference in a new issue