diff options
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 7be0d18e..e368826f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,12 +15,14 @@ env: - CONFIG=cpp - CONFIG=cpp_distcheck - CONFIG=csharp + - CONFIG=golang - CONFIG=java_jdk6 - CONFIG=java_jdk7 - CONFIG=java_oracle7 - CONFIG=javanano_jdk6 - CONFIG=javanano_jdk7 - CONFIG=javanano_oracle7 + - CONFIG=javascript - CONFIG=python - CONFIG=python_cpp - CONFIG=ruby19 @@ -48,6 +50,10 @@ matrix: # which doesn't work on OS X. - os: osx env: CONFIG=csharp + # Requires installing golang, currently travis.sh is doing that with apt-get + # which doesn't work on OS X. + - os: osx + env: CONFIG=golang # Add into the matrix OS X tests of Objective C (needs Xcode, so it won't # work on other platforms). These are split so it doesn't take as long to run. include: @@ -61,9 +67,5 @@ matrix: env: CONFIG=ruby22 - os: osx env: CONFIG=jruby - # Travis seems be flaky in letting the iOS simulator launch, so keep that - # flake from failing builds by marking that build as an allowed failure. - - os: osx - env: CONFIG=objectivec_ios notifications: email: false |