From 49a9d7f57a5a50e1cbbb3d40d906ffcf26fbf6bb Mon Sep 17 00:00:00 2001 From: Patrick Niklaus Date: Mon, 3 Oct 2016 17:21:24 +0200 Subject: [PATCH] Try switching to GCC 6 --- .travis.yml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index ceffe18f6..1c47109a1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,12 +35,12 @@ matrix: # Debug Builds - os: linux - compiler: "gcc-5-debug" - addons: &gcc5 + compiler: "gcc-6-debug" + addons: &gcc6 apt: sources: ['ubuntu-toolchain-r-test'] - packages: ['g++-5', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev', 'ccache'] - env: CCOMPILER='gcc-5' CXXCOMPILER='g++-5' BUILD_TYPE='Debug' COVERAGE=ON + packages: ['g++-6', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev', 'ccache'] + env: CCOMPILER='gcc-5' CXXCOMPILER='g++-6' BUILD_TYPE='Debug' COVERAGE=ON - os: linux compiler: "clang-3.8-debug" @@ -57,16 +57,16 @@ matrix: # Release Builds - os: linux - compiler: "gcc-5-release" - addons: &gcc5 + compiler: "gcc-6-release" + addons: &gcc6 apt: sources: ['ubuntu-toolchain-r-test'] - packages: ['g++-5', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev', 'ccache'] - env: CCOMPILER='gcc-5' CXXCOMPILER='g++-5' BUILD_TYPE='Release' + packages: ['g++-6', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev', 'ccache'] + env: CCOMPILER='gcc-6' CXXCOMPILER='g++-6' BUILD_TYPE='Release' - os: linux - compiler: "gcc-5-release-i686" - env: TARGET_ARCH='i686' CCOMPILER='gcc-5' CXXCOMPILER='g++-5' BUILD_TYPE='Release' + compiler: "gcc-6-release-i686" + env: TARGET_ARCH='i686' CCOMPILER='gcc-6' CXXCOMPILER='g++-6' BUILD_TYPE='Release' # Disabled because of CI slowness #- os: linux @@ -85,12 +85,12 @@ matrix: # Shared Library - os: linux - compiler: "gcc-5-release-shared" - addons: &gcc5 + compiler: "gcc-6-release-shared" + addons: &gcc6 apt: sources: ['ubuntu-toolchain-r-test'] - packages: ['g++-5', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev', 'ccache'] - env: CCOMPILER='gcc-5' CXXCOMPILER='g++-5' BUILD_TYPE='Release' BUILD_SHARED_LIBS=ON + packages: ['g++-6', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev', 'ccache'] + env: CCOMPILER='gcc-6' CXXCOMPILER='g++-6' BUILD_TYPE='Release' BUILD_SHARED_LIBS=ON # Disabled because CI slowness #- os: linux