Skip to content

Commit

Permalink
Merge pull request Alinshans#54 from Alinshans/maintain
Browse files Browse the repository at this point in the history
Remove the test: gcc on osx.
  • Loading branch information
Alinshans authored Nov 17, 2017
2 parents a8a1c4f + aa360d5 commit 0542149
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 8 deletions.
8 changes: 1 addition & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ matrix:
apt:
sources: ['ubuntu-toolchain-r-test']
packages: ['g++-6']

env:
- MATRIX_EVAL="CC=gcc-6 && CXX=g++-6"

Expand All @@ -31,15 +30,9 @@ matrix:
apt:
sources: ['ubuntu-toolchain-r-test']
packages: ['g++-7']

env:
- MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"

- os: osx
osx_image: xcode8
env:
- MATRIX_EVAL="brew install gcc5 && CC=gcc-5 && CXX=g++-5"

- os: osx
osx_image: xcode5
env:
Expand All @@ -62,6 +55,7 @@ matrix:


before_script:
- eval "${MATRIX_EVAL}"
- $CXX --version

script:
Expand Down
1 change: 0 additions & 1 deletion Test/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
Tests were built and run directly on `Tracis CI` and `AppVeyor` and had been tested in the following environments:

* linux, ubuntu 14.04, gcc5/6/7
* osx, gcc5
* osx, xcode5/6/7/8
* windows, VS2015/VS2017, [x64|x86], [Release|Debug]

Expand Down

0 comments on commit 0542149

Please sign in to comment.