diff options
| author |  Jorge Canizales <jcanizales@google.com> | 2016-07-12 11:44:35 -0700 |
|---|---|---|
| committer | Jorge Canizales <jcanizales@google.com> | 2016-07-12 11:44:35 -0700 |
| commit | 34b0cd0c4774835429354662f88340523dc19668 (patch) | |
| tree | 9f1e9a3938247141fac10c2887fb45e69839a89a /.travis.yml | |
| parent | cfccf2a149affe78dc5e3cf5f20f418452123feb (diff) | |
Fix Travis
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index 7576e076a0..6bab203929 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ env: - SCHEME="InteropTestsLocalCleartext" WORKSPACE="Tests.xcworkspace" TEST_PATH="src/objective-c/tests" BUILD_ONLY="false" INTEROP_SERVER="true" - # TODO(jcanizales): Investigate why they time out: + # TODO(jcanizales): Make tests an app project (instead of library), so the following will work. # - SCHEME="InteropTestsRemote" WORKSPACE="Tests.xcworkspace" # TEST_PATH="src/objective-c/tests" BUILD_ONLY="false" # INTEROP_SERVER="true" @@ -36,13 +36,10 @@ env: before_install: - pod --version - gem uninstall cocoapods -a - - gem install cocoapods -v '1.0.0' + - gem install cocoapods -v '1.0.1' - pod --version - brew install gflags install: - - make grpc_objective_c_plugin - - install bins/opt/grpc_objective_c_plugin /usr/local/bin/protoc-gen-objcgrpc - - install bins/opt/protobuf/protoc /usr/local/bin/protoc - pushd $TEST_PATH - pod install - popd |