diff options
| author | Chris Loer <chris.loer@gmail.com> | 2017-01-07 11:27:06 -0800 |
|---|---|---|
| committer | Chris Loer <chris.loer@gmail.com> | 2017-01-07 11:27:06 -0800 |
| commit | 2e3f791f761eb1a1c6f9b6a52c438729d4340825 (patch) | |
| tree | dd8d9a69d7cc278ee711c574dbb92513a8c4b886 | |
| parent | 428c0fdf70d08dfe433058a66a61bf9c4fb93d9d (diff) | |
| download | qtlocation-mapboxgl-2e3f791f761eb1a1c6f9b6a52c438729d4340825.tar.gz | |
[core] Bump standard library to libstdc++5-dev and clang version to 3.8. (#6991)
| -rw-r--r-- | .travis.yml | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/.travis.yml b/.travis.yml index 57f6e10abc..38635e6c3c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,10 +3,10 @@ git: # Save common build configurations as shortcuts, so we can reference them later. addons_shortcuts: - addons_clang35: &clang35 + addons_clang38: &clang38 apt: sources: [ 'ubuntu-toolchain-r-test', 'george-edison55-precise-backports' ] - packages: [ 'clang-3.5', 'libstdc++-4.9-dev', 'libstdc++6', 'libllvm3.8v4', 'cmake', 'cmake-data', + packages: [ 'clang-3.8', 'libstdc++-5-dev', 'libstdc++6', 'libllvm3.8v4', 'cmake', 'cmake-data', 'libxrandr-dev', 'libxcursor-dev', 'libxinerama-dev' ] addons_gcc5: &gcc5 apt: @@ -52,14 +52,14 @@ after_script: matrix: include: - # Clang 3.5 - Debug - Node + # Clang 3.8 - Debug - Node - os: linux sudo: required dist: trusty language: node - compiler: "node4-clang35-debug" - env: _CXX=clang++-3.5 _CC=clang-3.5 WITH_OSMESA=1 - addons: *clang35 + compiler: "node4-clang38-debug" + env: _CXX=clang++-3.8 _CC=clang-3.8 WITH_OSMESA=1 + addons: *clang38 before_script: - export PACKAGE_JSON_VERSION=$(node -e "console.log(require('./package.json').version)") - export PUBLISH=$([[ "${TRAVIS_TAG:-}" == "node-v${PACKAGE_JSON_VERSION}" ]] && echo true) @@ -95,32 +95,32 @@ matrix: env: BUILDTYPE=Release _CXX=g++-5 _CC=gcc-5 WITH_OSMESA=1 addons: *gcc5 - # Clang 3.5 - Debug + # Clang 3.8 - Debug - os: linux sudo: required dist: trusty language: cpp - compiler: "glfw-clang35-debug" - env: BUILDTYPE=Debug _CXX=clang++-3.5 _CC=clang-3.5 WITH_OSMESA=1 - addons: *clang35 + compiler: "glfw-clang38-debug" + env: BUILDTYPE=Debug _CXX=clang++-3.8 _CC=clang-3.8 WITH_OSMESA=1 + addons: *clang38 - # Clang 3.5 - Release + # Clang 3.8 - Release - os: linux sudo: required dist: trusty language: cpp - compiler: "glfw-clang35-release" - env: BUILDTYPE=Release _CXX=clang++-3.5 _CC=clang-3.5 WITH_OSMESA=1 - addons: *clang35 + compiler: "glfw-clang38-release" + env: BUILDTYPE=Release _CXX=clang++-3.8 _CC=clang-3.8 WITH_OSMESA=1 + addons: *clang38 - # Clang 3.5 - tidy + # Clang 3.8 - tidy - os: linux sudo: required dist: trusty language: cpp - compiler: "check-clang35-release" - env: BUILDTYPE=Release _CXX=clang++-3.5 _CC=clang-3.5 WITH_OSMESA=1 - addons: *clang35 + compiler: "check-clang38-release" + env: BUILDTYPE=Release _CXX=clang++-3.8 _CC=clang-3.8 WITH_OSMESA=1 + addons: *clang38 script: - git fetch origin master:refs/remotes/origin/master |