diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2015-12-07 18:56:55 -0800 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2015-12-07 18:56:55 -0800 |
| commit | 23a1e251c76ef4faa90a27f6c1ef8fb25d9d5b0b (patch) | |
| tree | 58d65c667cb2aee1971325e42d29b02655aa3f81 | |
| parent | 4bfc1433da7e46000a1ecd1928894dfe353c816c (diff) | |
| download | qtlocation-mapboxgl-upstream/3217-clang-tidy-libstdcpp-5.tar.gz | |
[test] switch to libstdc++-5 for clang-tidyupstream/3217-clang-tidy-libstdcpp-5
| -rw-r--r-- | .travis.yml | 129 |
1 files changed, 64 insertions, 65 deletions
diff --git a/.travis.yml b/.travis.yml index 9bbd27b825..2a3097e11b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,9 +17,8 @@ addons_shortcuts: addons_clang38-tidy: &clang38-tidy apt: sources: [ 'ubuntu-toolchain-r-test', 'llvm-toolchain-precise' ] - packages: [ 'clang-tidy-3.8', 'clang-3.8', 'libgcc-4.9-dev', 'libstdc++-4.9-dev', 'libstdc++6', - 'libllvm3.4', 'libclang-common-3.8-dev', 'libclang1-3.8', 'liblldb-3.8', - 'libllvm3.8', 'lldb-3.8', 'llvm-3.8', 'llvm-3.8-dev', 'llvm-3.8-runtime', 'xutils-dev', + packages: [ 'clang-tidy-3.8', 'clang-3.8', 'libgcc-5-dev', 'libstdc++-5-dev', 'libstdc++6', + 'libllvm3.4', 'libclang-common-3.8-dev', 'libclang1-3.8', 'xutils-dev', 'libxxf86vm-dev', 'x11proto-xf86vidmode-dev', 'mesa-utils' ] matrix: @@ -27,68 +26,68 @@ matrix: - os: linux include: - # OS X - Xcode 7 - Debug - - os: osx - osx_image: xcode7 - compiler: clang - env: FLAVOR=osx BUILDTYPE=Debug - - - # OS X/Node.js 5 - Xcode 7 - - os: osx - osx_image: xcode7 - compiler: clang - env: FLAVOR=node NODE_VERSION=5 - - # OS X/Node.js 4 - Xcode 7 - - os: osx - osx_image: xcode7 - compiler: clang - env: FLAVOR=node NODE_VERSION=4 - - # OS X/Node.js 0.10 - Xcode 7 - - os: osx - osx_image: xcode7 - compiler: clang - env: FLAVOR=node NODE_VERSION=0.10 - - - # Linux/Node.js 5 - Clang 3.5 - Release - - os: linux - compiler: ": node5-clang35-release" - env: FLAVOR=node BUILDTYPE=Release NODE_VERSION=5 _CXX=clang++-3.5 _CC=clang-3.5 CCACHE=1 - addons: *clang35 - - # Linux/Node.js 4 - Clang 3.5 - Release - - os: linux - compiler: ": node4-clang35-release" - env: FLAVOR=node BUILDTYPE=Release NODE_VERSION=4 _CXX=clang++-3.5 _CC=clang-3.5 CCACHE=1 - addons: *clang35 - - # Linux/Node.js 0.10 - Clang 3.5 - Release - - os: linux - compiler: ": node0.10-clang35-release" - env: FLAVOR=node BUILDTYPE=Release NODE_VERSION=0.10 _CXX=clang++-3.5 _CC=clang-3.5 CCACHE=1 - addons: *clang35 - - - # Linux - GCC 4.9 - Release - - os: linux - compiler: ": linux-gcc49-release" - env: FLAVOR=linux BUILDTYPE=Release _CXX=g++-4.9 _CC=gcc-4.9 CCACHE=1 - addons: *gcc49 - - # Linux - Clang 3.5 - Debug - - os: linux - compiler: ": linux-clang35-debug" - env: FLAVOR=linux BUILDTYPE=Debug _CXX=clang++-3.5 _CC=clang-3.5 CCACHE=1 - addons: *clang35 - - # Linux - Clang 3.5 - Release - - os: linux - compiler: ": linux-clang35-release" - env: FLAVOR=linux BUILDTYPE=Release _CXX=clang++-3.5 _CC=clang-3.5 CCACHE=1 - addons: *clang35 + # # OS X - Xcode 7 - Debug + # - os: osx + # osx_image: xcode7 + # compiler: clang + # env: FLAVOR=osx BUILDTYPE=Debug + + + # # OS X/Node.js 5 - Xcode 7 + # - os: osx + # osx_image: xcode7 + # compiler: clang + # env: FLAVOR=node NODE_VERSION=5 + + # # OS X/Node.js 4 - Xcode 7 + # - os: osx + # osx_image: xcode7 + # compiler: clang + # env: FLAVOR=node NODE_VERSION=4 + + # # OS X/Node.js 0.10 - Xcode 7 + # - os: osx + # osx_image: xcode7 + # compiler: clang + # env: FLAVOR=node NODE_VERSION=0.10 + + + # # Linux/Node.js 5 - Clang 3.5 - Release + # - os: linux + # compiler: ": node5-clang35-release" + # env: FLAVOR=node BUILDTYPE=Release NODE_VERSION=5 _CXX=clang++-3.5 _CC=clang-3.5 CCACHE=1 + # addons: *clang35 + + # # Linux/Node.js 4 - Clang 3.5 - Release + # - os: linux + # compiler: ": node4-clang35-release" + # env: FLAVOR=node BUILDTYPE=Release NODE_VERSION=4 _CXX=clang++-3.5 _CC=clang-3.5 CCACHE=1 + # addons: *clang35 + + # # Linux/Node.js 0.10 - Clang 3.5 - Release + # - os: linux + # compiler: ": node0.10-clang35-release" + # env: FLAVOR=node BUILDTYPE=Release NODE_VERSION=0.10 _CXX=clang++-3.5 _CC=clang-3.5 CCACHE=1 + # addons: *clang35 + + + # # Linux - GCC 4.9 - Release + # - os: linux + # compiler: ": linux-gcc49-release" + # env: FLAVOR=linux BUILDTYPE=Release _CXX=g++-4.9 _CC=gcc-4.9 CCACHE=1 + # addons: *gcc49 + + # # Linux - Clang 3.5 - Debug + # - os: linux + # compiler: ": linux-clang35-debug" + # env: FLAVOR=linux BUILDTYPE=Debug _CXX=clang++-3.5 _CC=clang-3.5 CCACHE=1 + # addons: *clang35 + + # # Linux - Clang 3.5 - Release + # - os: linux + # compiler: ": linux-clang35-release" + # env: FLAVOR=linux BUILDTYPE=Release _CXX=clang++-3.5 _CC=clang-3.5 CCACHE=1 + # addons: *clang35 # clang-tidy - Clang 3.8 - Release - os: linux |