diff options
| author |  Thomas Van Lenten <thomasvl@google.com> | 2016-03-29 11:55:04 -0400 |
|---|---|---|
| committer | Thomas Van Lenten <thomasvl@google.com> | 2016-03-29 11:55:04 -0400 |
| commit | 261ee021f640ea6fe67aaf1f53e1518ed154cad0 (patch) | |
| tree | 9f26e926a40a04a1f74510f35b4e21ca04846e50 /.travis.yml | |
| parent | 9240acd179708c3a2ab79508af6fd68efa6f883a (diff) | |
| parent | 8d47d7873e7cf332d30e7a661a4ec9cc4d794ad8 (diff) | |
Merge pull request #1358 from thomasvl/travis_tweaks
Mark iOS tests as able to fail.
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index 9bc4d88f..60c0427d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -71,5 +71,14 @@ matrix: # we moved to an OS X image that is 10.11. - os: osx env: CONFIG=python_cpp + # xctool 0.2.8 seems to have a bug where it randomly kills tests saying + # they failed. + # https://github.com/facebook/xctool/issues/619 + # https://github.com/google/protobuf/issues/1232 + # travis updated their images to include 0.2.8: + # https://blog.travis-ci.com/2016-03-23-xcode-image-updates + # Mark the iOS test as flakey so these failures don't turn things red. + - os: osx + env: CONFIG=objectivec_ios notifications: email: false |