From 34b0cd0c4774835429354662f88340523dc19668 Mon Sep 17 00:00:00 2001 From: Jorge Canizales Date: Tue, 12 Jul 2016 11:44:35 -0700 Subject: Fix Travis --- .travis.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to '.travis.yml') 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 -- cgit v1.2.3