diff options
author | Sergio Campamá <kaipi@google.com> | 2016-06-14 11:26:01 -0700 |
---|---|---|
committer | Thomas Van Lenten <thomasvl@google.com> | 2016-06-14 14:26:01 -0400 |
commit | f0c1492ef6a6ad17ef62d49cd671980742729783 (patch) | |
tree | 13589f1f72c5a333f4abc9269fbfb18f232f607e /.travis.yml | |
parent | 71f4a9c6f35007609ef423ab643c05c1f88731ce (diff) | |
download | protobuf-f0c1492ef6a6ad17ef62d49cd671980742729783.tar.gz protobuf-f0c1492ef6a6ad17ef62d49cd671980742729783.tar.bz2 protobuf-f0c1492ef6a6ad17ef62d49cd671980742729783.zip |
Add the CocoaPods integration tests to Travis.
Also hotwires updating ruby as CocoaPods was crashing within a support library.
Fixes #1619
Diffstat (limited to '.travis.yml')
-rw-r--r-- | .travis.yml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index 86451edd..46abbb9e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,6 +28,7 @@ env: - CONFIG=objectivec_ios_debug - CONFIG=objectivec_ios_release - CONFIG=objectivec_osx + - CONFIG=objectivec_cocoapods_integration - CONFIG=python - CONFIG=python_cpp - CONFIG=ruby19 @@ -67,6 +68,8 @@ matrix: env: CONFIG=objectivec_ios_release - os: linux env: CONFIG=objectivec_osx + - os: linux + env: CONFIG=objectivec_cocoapods_integration allow_failures: # These currently do not work on OS X but are being worked on by @haberman. - os: osx |