diff options
author | alien <the-alien@live.ru> | 2016-03-29 20:58:23 +0300 |
---|---|---|
committer | alien <the-alien@live.ru> | 2016-03-29 20:58:23 +0300 |
commit | af34538aca9d91b86826223624018a69370caa1d (patch) | |
tree | e946d75326662d0e2f72a4379de098fa61c25705 /travis.sh | |
parent | 6f8dd2115b3ed07819a48dfa78b15770dfa2c450 (diff) | |
parent | 261ee021f640ea6fe67aaf1f53e1518ed154cad0 (diff) | |
download | protobuf-af34538aca9d91b86826223624018a69370caa1d.tar.gz protobuf-af34538aca9d91b86826223624018a69370caa1d.tar.bz2 protobuf-af34538aca9d91b86826223624018a69370caa1d.zip |
Merge branch 'master' of https://github.com/google/protobuf into csharp_json_name
Diffstat (limited to 'travis.sh')
-rwxr-xr-x | travis.sh | 8 |
1 files changed, 1 insertions, 7 deletions
@@ -171,13 +171,7 @@ internal_objectivec_common () { # http://docs.travis-ci.com/user/osx-ci-environment/ # We don't use a before_install because we test multiple OSes. brew update - # xctool 0.2.8 seems to have a bug where it randomly kills tests saying - # they failed. Disabling the updates, but letting it report about being - # updates as a hint that this needs to eventually get re-enabled. - # https://github.com/facebook/xctool/issues/619 - # https://github.com/google/protobuf/issues/1232 - brew outdated xctool || true - #brew outdated xctool || brew upgrade xctool + brew outdated xctool || brew upgrade xctool # Reused the build script that takes care of configuring and ensuring things # are up to date. Xcode and conformance tests will be directly invoked. objectivec/DevTools/full_mac_build.sh \ |