Skip to content

Commit 1af4f21

Browse files
authored
Merge pull request #1214 from est77/est_travis_gcc6
Add gcc 6 C++11 to travis builds, remove gcc 4.6.
2 parents 5c3f887 + 1972b0d commit 1af4f21

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

.travis.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ addons:
1515
- g++-4.8
1616
- gcc-5
1717
- g++-5
18+
- gcc-6
19+
- g++-6
1820

1921
before_install:
2022
- git clone https://github.com/appleseedhq/travis-linux-deps.git
@@ -31,10 +33,6 @@ env:
3133

3234
matrix:
3335
include:
34-
- os: linux
35-
compiler: gcc
36-
env: GCC_VERSION= USE_CPP11=OFF
37-
3836
- os: linux
3937
compiler: gcc
4038
env: GCC_VERSION=5 USE_CPP11=OFF
@@ -47,6 +45,10 @@ matrix:
4745
compiler: gcc
4846
env: GCC_VERSION=5 USE_CPP11=ON
4947

48+
- os: linux
49+
compiler: gcc
50+
env: GCC_VERSION=6 USE_CPP11=ON
51+
5052
script:
5153
- ./travis/build.sh
5254

0 commit comments

Comments
 (0)