diff options
author | Thomas Van Lenten <thomasvl@google.com> | 2016-12-09 14:38:20 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-12-09 14:38:20 -0500 |
commit | dc119405683c578fd38129cbef3a66e1fd60938c (patch) | |
tree | b5bdea1143a19a7b67dc9499e77c2585f1885cd1 | |
parent | e43f73e09906004a0ccd2644984dbbae07c595da (diff) | |
parent | 1ac8944294217b48413987bdf7b3eafea3cc3130 (diff) | |
download | protobuf-dc119405683c578fd38129cbef3a66e1fd60938c.tar.gz protobuf-dc119405683c578fd38129cbef3a66e1fd60938c.tar.bz2 protobuf-dc119405683c578fd38129cbef3a66e1fd60938c.zip |
Merge pull request #2475 from sergiocampama/rvm2
Reenable cocoapods objc test and remove unnecessary workaround for rvm
-rw-r--r-- | .travis.yml | 4 | ||||
-rwxr-xr-x | tests.sh | 9 |
2 files changed, 0 insertions, 13 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 @@ -275,15 +275,6 @@ build_objectivec_osx() { } build_objectivec_cocoapods_integration() { - # First, load the RVM environment in bash, needed to update ruby. - source ~/.rvm/scripts/rvm - # Update rvm to the latest version. This is needed to solve - # https://github.com/google/protobuf/issues/1786 and may not be needed in the - # future when Travis updates the default version of rvm. - rvm get head - # Update ruby to 2.2.3 as the default one crashes with segmentation faults - # when using pod. - rvm use 2.2.3 --install --binary --fuzzy # Update pod to the latest version. gem install cocoapods --no-ri --no-rdoc objectivec/Tests/CocoaPods/run_tests.sh |