-
Notifications
You must be signed in to change notification settings - Fork 4.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update protobuf to latest master at a64497c and apply @laszlocsomor's…
… latest changes from protocolbuffers/protobuf#2969 on top of it. Change-Id: Ie49c5dcac06e370c5ab3863dc061513531ec8c0d
- Loading branch information
Showing
380 changed files
with
22,232 additions
and
7,098 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,88 @@ | ||
sudo: required | ||
dist: trusty | ||
# Note: travis currently does not support listing more than one language so | ||
# this cheats and claims to only be cpp. If they add multiple language | ||
# support, this should probably get updated to install steps and/or | ||
# rvm/gemfile/jdk/etc. entries rather than manually doing the work. | ||
language: cpp | ||
os: | ||
- osx | ||
# The Objective C build needs Xcode 7.0 or later. | ||
osx_image: xcode8.1 | ||
script: | ||
- ./tests.sh $CONFIG | ||
env: | ||
- CONFIG=cpp | ||
- CONFIG=cpp_distcheck | ||
- CONFIG=golang | ||
- CONFIG=java_jdk7 | ||
- CONFIG=java_oracle7 | ||
- CONFIG=javanano_jdk7 | ||
- CONFIG=javanano_oracle7 | ||
- CONFIG=javascript | ||
# iOS build log was starting to choke travis UI, so split to cover the | ||
# Xcode Debug and Release Configurations independently. | ||
- CONFIG=objectivec_ios_debug | ||
- CONFIG=objectivec_ios_release | ||
- CONFIG=objectivec_osx | ||
- CONFIG=objectivec_cocoapods_integration | ||
- CONFIG=python | ||
- CONFIG=python_cpp | ||
- CONFIG=ruby21 | ||
- CONFIG=ruby22 | ||
- CONFIG=jruby | ||
- CONFIG=php5.6_mac | ||
- CONFIG=php7.0_mac | ||
matrix: | ||
exclude: | ||
# It's nontrivial to programmatically install a new JDK from the command | ||
# line on OS X, so we rely on testing on Linux for Java code. | ||
- os: osx | ||
env: CONFIG=java_jdk7 | ||
- os: osx | ||
env: CONFIG=java_oracle7 | ||
- os: osx | ||
env: CONFIG=javanano_jdk7 | ||
- os: osx | ||
env: CONFIG=javanano_oracle7 | ||
# Requires installing golang, currently travis.sh is doing that with apt-get | ||
# which doesn't work on OS X. | ||
- os: osx | ||
env: CONFIG=golang | ||
include: | ||
# The dotnet environment requires Ubuntu 14.04 or 16.04. This | ||
# configuration is effectively an "extra" one, outside the | ||
# autogenerated matrix. | ||
- os: linux | ||
env: CONFIG=csharp | ||
dist: trusty | ||
# This test is kept on travis because it doesn't play nicely with other | ||
# tests on jenkins running in parallel. | ||
- os: linux | ||
env: CONFIG=cpp_distcheck | ||
# The Java compatibility test currently only runs on Linux because it will | ||
# fetch pre-built Linux protoc binaries in the test. | ||
- os: linux | ||
env: CONFIG=java_compatibility | ||
# The Python compatibility test currently only runs on Linux because it will | ||
# fetch pre-built Linux protoc binaries in the test. | ||
- os: linux | ||
env: CONFIG=python_compatibility | ||
allow_failures: | ||
# These currently do not work on OS X but are being worked on by @haberman. | ||
- os: osx | ||
env: CONFIG=ruby22 | ||
- os: osx | ||
env: CONFIG=jruby | ||
# https://github.com/google/protobuf/issues/1253 - Started failing when | ||
# we moved to an OS X image that is 10.11. | ||
- os: osx | ||
env: CONFIG=python_cpp | ||
# Mark the iOS test as flakey as xcodebuild some times fails to start the | ||
# iOS Simulator. | ||
- os: osx | ||
env: CONFIG=objectivec_ios_debug | ||
- os: osx | ||
env: CONFIG=objectivec_ios_release | ||
notifications: | ||
email: false |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.