diff options
| author |  Thomas Van Lenten <thomasvl@google.com> | 2015-06-10 17:21:23 -0400 |
|---|---|---|
| committer | Thomas Van Lenten <thomasvl@google.com> | 2015-11-09 10:54:32 -0500 |
| commit | 9642b821f2b79df9f44e4124318c23dd8addb82e (patch) | |
| tree | 7f0699fe5309b9d5ee2d257d79f97a90377c6132 /.travis.yml | |
| parent | 64aa954daec2f6f2df460f9bcc1e2ca6ba42b640 (diff) | |
Add ObjC build to travis setup
- Add objc for iOS and OS X builds to travis configs.
- Update handing of python install to deal with newer OS X versions.
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index 4edf3b30..7be0d18e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,8 @@ language: cpp os: - linux - osx +# The Objective C build needs Xcode 6.4 or later. +osx_image: xcode7.1 script: - ./travis.sh $CONFIG env: @@ -46,11 +48,22 @@ matrix: # which doesn't work on OS X. - os: osx env: CONFIG=csharp + # 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: + - os: osx + env: CONFIG=objectivec_ios + - os: osx + env: CONFIG=objectivec_osx allow_failures: # These currently do not work on OS X but are being worked on by @haberman. - os: osx 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 |