diff options
| author |  Josh Haberman <jhaberman@gmail.com> | 2016-03-29 16:24:35 -0700 |
|---|---|---|
| committer | Josh Haberman <jhaberman@gmail.com> | 2016-03-29 16:24:35 -0700 |
| commit | a15b916c419000565384a78224e402ed925e5fc8 (patch) | |
| tree | d0bd6aa4648fddbb08d35d8b78dba32958ae7b51 /.travis.yml | |
| parent | 67c727cd411a339eb4233c84d9a1afadd8c20566 (diff) | |
| parent | 261ee021f640ea6fe67aaf1f53e1518ed154cad0 (diff) | |
Merge branch 'master' into docker
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 f8d2347c..bcf3851b 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 |