diff options
| author |  Jorge Canizales <jcanizales@google.com> | 2016-06-24 12:48:43 -0700 |
|---|---|---|
| committer | Jorge Canizales <jcanizales@google.com> | 2016-06-24 12:48:43 -0700 |
| commit | 8a556b7fe34355faf6573d8958cdb0730dd41956 (patch) | |
| tree | 06ca945c0cb9d31c640b13eda3fcb1de4b084aff /.travis.yml | |
| parent | fa70dacf95b93486b7dfe0c21ada90d75a5d5bcd (diff) | |
| parent | 0140f7c9e6c20fe78035d9635a3f5725d51ad35a (diff) | |
Merge master into let-invalidate-channels
Had to manually resolve import conflicts in InteropTests.m
To be fair, the merge algorithm should have been able to do it.
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index 004d44f3a5..16c6390a54 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,20 +1,23 @@ language: objective-c -osx_image: xcode7.2 +osx_image: xcode7.3 env: global: - CONFIG=opt - TEST=objc - JOBS=1 before_install: + - pod --version + - gem uninstall cocoapods -a + - gem install cocoapods -v '1.0.0' + - pod --version - brew install gflags - # Pod install does this too, but we don't want the output. - - pod repo update --silent + - pushd third_party/protobuf + - git checkout v3.0.0-beta-3 + - popd install: - make grpc_objective_c_plugin - pushd src/objective-c/tests - # Needs to be verbose, or otherwise OpenSSL's prepare_command makes Travis - # time out: - - pod install --verbose + - pod install - popd before_script: - make interop_server @@ -27,6 +30,6 @@ xcode_scheme: - InteropTestsLocalCleartext # TODO(jcanizales): Investigate why they time out: # - InteropTestsRemote -xcode_sdk: iphonesimulator9.2 +xcode_sdk: iphonesimulator9.3 notifications: email: false |