Fixed failed builds. Removed some os/compiler combinations that I couldn't get working.

This commit is contained in:
zerodefect 2018-01-23 20:46:23 +00:00
parent 9863fd87ee
commit 1fb885d334
1 changed files with 1 additions and 26 deletions

View File

@ -21,31 +21,19 @@ matrix:
# Linux / GCC # 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 - os: linux
compiler: gcc compiler: gcc
env: env:
- COMPILER=g++-5 - COMPILER=g++-5
- CXXFLAGS=-std=c++11
addons: addons:
apt: apt:
sources: ['ubuntu-toolchain-r-test'] #sources: ['ubuntu-toolchain-r-test']
packages: ['g++-5', 'ninja-build'] packages: ['g++-5', 'ninja-build']
- os: linux - os: linux
compiler: gcc compiler: gcc
env: env:
- COMPILER=g++-6 - COMPILER=g++-6
- CXXFLAGS=-std=c++11
addons: addons:
apt: apt:
sources: ['ubuntu-toolchain-r-test'] sources: ['ubuntu-toolchain-r-test']
@ -55,7 +43,6 @@ matrix:
compiler: gcc compiler: gcc
env: env:
- COMPILER=g++-7 - COMPILER=g++-7
- CXXFLAGS=-std=c++11
addons: addons:
apt: apt:
sources: ['ubuntu-toolchain-r-test'] sources: ['ubuntu-toolchain-r-test']
@ -65,21 +52,10 @@ matrix:
# Linux / Clang # 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 - os: linux
compiler: clang compiler: clang
env: env:
- COMPILER=clang++-4.0 - COMPILER=clang++-4.0
- CXXFLAGS=-std=c++11
addons: addons:
apt: apt:
sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-4.0'] sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-4.0']
@ -89,7 +65,6 @@ matrix:
compiler: clang compiler: clang
env: env:
- COMPILER=clang++-5.0 - COMPILER=clang++-5.0
- CXXFLAGS=-std=c++11
addons: addons:
apt: apt:
sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-5.0'] sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-5.0']