diff options
| author |  Sergio Campama <kaipi@google.com> | 2016-12-09 11:26:11 -0500 |
|---|---|---|
| committer | Sergio Campama <kaipi@google.com> | 2016-12-09 11:26:11 -0500 |
| commit | 1ac8944294217b48413987bdf7b3eafea3cc3130 (patch) | |
| tree | b5bdea1143a19a7b67dc9499e77c2585f1885cd1 /.travis.yml | |
| parent | e43f73e09906004a0ccd2644984dbbae07c595da (diff) | |
Reenable cocoapods objc test and remove unnecessary workaround for rvm
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 7011546e..a34cb83b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -73,10 +73,6 @@ matrix: # we moved to an OS X image that is 10.11. - os: osx env: CONFIG=python_cpp - # This started failing with the OS X 10.12 / Xcode 8.1 image. - # https://github.com/google/protobuf/issues/2472 - - os: osx - env: CONFIG=objectivec_cocoapods_integration # Mark the iOS test as flakey as xcodebuild some times fails to start the # iOS Simulator. - os: osx |