Skip to content

Commit 2c5dd45

Browse files
author
ayla
committed
Test status of linux master build on Travis Ubuntu host with GCC.
1 parent 7789bb1 commit 2c5dd45

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

.travis.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,12 @@ os:
77

88
compiler:
99
- clang
10-
# TODO: gcc chokes on a boost pthread usage, disabling for now.
11-
# - gcc
10+
- gcc
11+
12+
matrix:
13+
exclude:
14+
- os: osx
15+
compiler: g++
1216

1317
# check environment (copied from libgit2sharp)
1418
before_install:
@@ -20,7 +24,7 @@ before_install:
2024
# make sure cmake is installed, set up latest GCC C++ compiler if necessary
2125
install:
2226
- if [ "${TRAVIS_OS_NAME}" = "linux" ]; then ./ci/linux_install.sh; fi
23-
# - if [ "${TRAVIS_OS_NAME}" = "linux" -a "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi
27+
- if [ "${TRAVIS_OS_NAME}" = "linux" -a "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi
2428
- if [ "${TRAVIS_OS_NAME}" = "osx" ]; then ./ci/osx_install.sh; fi
2529

2630
# TODO: could move script to separate file

0 commit comments

Comments
 (0)