diff options
| author | Thomas Van Lenten <thomasvl@google.com> | 2015-12-11 10:43:12 -0500 |
|---|---|---|
| committer | Thomas Van Lenten <thomasvl@google.com> | 2015-12-11 10:43:12 -0500 |
| commit | 99a6a95c751a28a3cc33dd2384959179f83f682c (patch) | |
| tree | 94fc5e48edf2dcd9e298f4b450e016687d2ac099 /.travis.yml | |
| parent | 2f2da0702db0aab16f473a86b28de854e5740295 (diff) | |
| parent | 938ba4103934db7459a920ca0cd96f0fd3953695 (diff) | |
| download | protobuf-99a6a95c751a28a3cc33dd2384959179f83f682c.tar.gz protobuf-99a6a95c751a28a3cc33dd2384959179f83f682c.tar.bz2 protobuf-99a6a95c751a28a3cc33dd2384959179f83f682c.zip | |
Merge pull request #1041 from thomasvl/use_xc7
Update the min toolchain for iOS/OS X to be Xcode 7
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 7780174c..7daee86b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -66,9 +66,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 |