From 1fb885d334a88c3176da234c38c937b220c449aa Mon Sep 17 00:00:00 2001 From: zerodefect Date: Tue, 23 Jan 2018 20:46:23 +0000 Subject: [PATCH] Fixed failed builds. Removed some os/compiler combinations that I couldn't get working. --- .travis.yml | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4adc133..434fb28 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,31 +21,19 @@ matrix: # Linux / GCC ################ - - os: linux - compiler: gcc - env: - - COMPILER=g++-4.9 - - CXXFLAGS=-std=c++11 - addons: - apt: - sources: ['ubuntu-toolchain-r-test'] - packages: ['g++-4.9', 'ninja-build'] - - os: linux compiler: gcc env: - COMPILER=g++-5 - - CXXFLAGS=-std=c++11 addons: apt: - sources: ['ubuntu-toolchain-r-test'] + #sources: ['ubuntu-toolchain-r-test'] packages: ['g++-5', 'ninja-build'] - os: linux compiler: gcc env: - COMPILER=g++-6 - - CXXFLAGS=-std=c++11 addons: apt: sources: ['ubuntu-toolchain-r-test'] @@ -55,7 +43,6 @@ matrix: compiler: gcc env: - COMPILER=g++-7 - - CXXFLAGS=-std=c++11 addons: apt: sources: ['ubuntu-toolchain-r-test'] @@ -65,21 +52,10 @@ matrix: # Linux / Clang ################ - - os: linux - compiler: clang - env: - - COMPILER=clang++-3.9 - - CXXFLAGS=-std=c++11 - addons: - apt: - sources: ['ubuntu-toolchain-r-test'] - packages: ['g++-6', 'clang-3.9', 'ninja-build'] - - os: linux compiler: clang env: - COMPILER=clang++-4.0 - - CXXFLAGS=-std=c++11 addons: apt: sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-4.0'] @@ -89,7 +65,6 @@ matrix: compiler: clang env: - COMPILER=clang++-5.0 - - CXXFLAGS=-std=c++11 addons: apt: sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-5.0']