Commit 73e8c8aa authored by Thomas Van Lenten's avatar Thomas Van Lenten

Instead of listing and then excluding osx builds, just don't list them.

parent 91ff83c0
...@@ -14,11 +14,10 @@ script: ...@@ -14,11 +14,10 @@ script:
env: env:
- CONFIG=cpp - CONFIG=cpp
- CONFIG=cpp_distcheck - CONFIG=cpp_distcheck
- CONFIG=golang # Testing go requires installing golang, currently travis.sh is doing that
- CONFIG=java_jdk7 # with apt-get which doesn't work on OS X.
- CONFIG=java_oracle7 # It's nontrivial to programmatically install a new JDK from the command
- CONFIG=javanano_jdk7 # line on OS X, so we rely on testing on Linux for Java code.
- CONFIG=javanano_oracle7
- CONFIG=javascript - CONFIG=javascript
# iOS build log was starting to choke travis UI, so split to cover the # iOS build log was starting to choke travis UI, so split to cover the
# Xcode Debug and Release Configurations independently. # Xcode Debug and Release Configurations independently.
...@@ -34,21 +33,6 @@ env: ...@@ -34,21 +33,6 @@ env:
- CONFIG=php5.6_mac - CONFIG=php5.6_mac
- CONFIG=php7.0_mac - CONFIG=php7.0_mac
matrix: matrix:
exclude:
# It's nontrivial to programmatically install a new JDK from the command
# line on OS X, so we rely on testing on Linux for Java code.
- os: osx
env: CONFIG=java_jdk7
- os: osx
env: CONFIG=java_oracle7
- os: osx
env: CONFIG=javanano_jdk7
- os: osx
env: CONFIG=javanano_oracle7
# Requires installing golang, currently travis.sh is doing that with apt-get
# which doesn't work on OS X.
- os: osx
env: CONFIG=golang
include: include:
# The dotnet environment requires Ubuntu 14.04 or 16.04. This # The dotnet environment requires Ubuntu 14.04 or 16.04. This
# configuration is effectively an "extra" one, outside the # configuration is effectively an "extra" one, outside the
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment