aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | Added support for building the aarch64 and ppcle64 protoc binaries with KokoroAdam Cozzette2018-08-012-8/+13
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was fairly straightforward using the existing build-protoc.sh script. The only problem I ran into was that the x86 Docker builds create output directories owned by root, which caused some permission issues. Fortunately it was easy to get around that just by doing those Docker builds last.
| * | | | Merge pull request #4991 from acozzette/merge-3-6-xAdam Cozzette2018-08-0138-80/+126
| |\ \ \ \ | | | | | | | | | | | | Merge 3.6.x branch into master
| | * | | | Merge branch '3.6.x' into merge-3-6-xAdam Cozzette2018-08-0138-80/+126
| |/| | | |
| | * | | | Updated change log for 3.6.1 releasev3.6.1Adam Cozzette2018-07-271-0/+12
| | | | | |
| | * | | | Updated version numbers to 3.6.1Adam Cozzette2018-07-2726-45/+45
| | | | | |
| | * | | | Check the message to be encoded is the wrong type. (#4885) (#4949)Paul Yang2018-07-232-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Check the message to be encoded is the wrong type. (#4885) * Change TypeError to ArgumentError
| | * | | | Make assertEquals pass for message (#4947)Paul Yang2018-07-202-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | This change only makes assertEquals pass for message in c extension. However, it actually does nothing. This is the same behavior before 3.6.0 release.
| | * | | | Merge pull request #4924 from xfxyjwf/3.6.xFeng Xiao2018-07-1733-506/+663
| | |\ \ \ \ | | | | | | | | | | | | | | Cherry-pick master build fixes and kokoro changes to 3.6.x
| | | * | | | Add continuous test for ruby 2.3, 2.4 and 2.5 (#4829)Paul Yang2018-07-175-36/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add continuous test for ruby 2.3, 2.4 and 2.5 * Change ruby 2.5 to 2.5.0 * No need to provide argument to rb_funcall when argc is 0 * Fix tests for ruby 2.5 * Use rescue instead of assert_raise to accept subclass of error
| | | * | | | Fix cpp_distcheckBSBandme2018-07-171-2/+0
| | | | | | |
| | | * | | | Fix php conformance test.Feng Xiao2018-07-171-2/+2
| | | | | | |
| | | * | | | protoc-artifacts: Update centos base from 6.6 to 6.9Eric Anderson2018-07-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This avoids the need to use "yum update && yum upgrade" in the container to be able to contact GitHub, which requires TLS 1.2[1]. I have verified that binaries built with this container still run in the previous container; no errors like "/lib64/libc.so.6: version `GLIBC_2.14' not found", which occur if using too new of a glibc when compiling. CentOS 6.6 has glibc version 2.12 release 1.209.el6. CentOS 6.9 has glibc version 2.12 release 1.149.el6. Both would upgrade to release 1.212.el6 via "yum update && yum upgrade". 1. https://githubengineering.com/crypto-deprecation-notice/
| | | * | | | Updated Docker setup to use GCC 4.8Adam Cozzette2018-07-173-10/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that we depend on C++11, we need at least GCC 4.8 instead of 4.7. This change updates the Docker setup to continue using CentOS 6.6 but with GCC 4.8. I also added libm to the whitelist for dynamically linked libraries for the ARM64 protoc binary.
| | | * | | | Remove js_embed binary. (#4709)Feng Xiao2018-07-166-159/+230
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove js_embed binary.
| | | * | | | Fix cpp benchmark dependency on macBSBandme2018-07-161-0/+1
| | | | | | |
| | | * | | | Comment out unused command from release script.Feng Xiao2018-07-151-1/+1
| | | | | | |
| | | * | | | Run autogen.sh in release script.Feng Xiao2018-07-151-0/+6
| | | | | | |
| | | * | | | Add protoc release script for Linux build.Feng Xiao2018-07-153-2/+39
| | | | | | |
| | | * | | | Add cpp tests under release docker image.Feng Xiao2018-07-154-99/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Added C++ tests under the release docker image. 2. Cleaned up tests.sh and removed traivis stuff.
| | | * | | | Update protoc build scripts.Feng Xiao2018-07-153-173/+167
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Changed maven script to only do artifact uploading and removed build script invocation from it. We didn't use maven to invoke the build script before (we built protoc manually and editted pom.xml to only do uploading for previous releases), and will not use it in the future (we will use kokoro to build artifacts). 2. Cleaned up build-protoc.sh and README.md: removed the part about using maven to build and listed supported platforms explicitly.
| | | * | | | Fix 32bit php testsBo Yang2018-07-154-20/+24
| | | | | | |
| | | * | | | Fix php testsBo Yang2018-07-153-0/+4
| | | | | | |
| | | * | | | fix golang kokoro linux buildYilun Chong2018-07-151-1/+1
| | | | | | |
| | | * | | | fix python cpp kokoro buildYilun Chong2018-07-152-1/+4
| | | | | | |
| | | * | | | fix linux kokoro build in dockerYilun Chong2018-07-151-1/+5
| | |/ / / /
| | * | | | fix for API change in PHP 7.3 (#4898)Paul Yang2018-07-127-20/+36
| | | | | |
| | * | | | Make ruby release configs consistent with protoc.Feng Xiao2018-07-1110-19/+19
| | | | | |
| | * | | | Merge pull request #4900 from xfxyjwf/3.6.xFeng Xiao2018-07-114-2/+32
| | |\ \ \ \ | | | | | | | | | | | | | | Add kokoro bazel configs to 3.6.x branch.
| | | * | | | Fix bazel build of examples.Feng Xiao2018-07-111-2/+10
| | | | | | |
| | | * | | | Add kokoro bazel configs for 3.6.x branch.Feng Xiao2018-07-113-0/+22
| | |/ / / /
| | * | | | Merge pull request #4880 from nashimus/3.6.xFeng Xiao2018-07-092-11/+29
| | |\ \ \ \ | | | | | | | | | | | | | | Additional support for building and deploying ppcle_64 artifacts
| | | * | | | Additional support for building and deploying ppcle_64 artifactsnashimus2018-07-062-11/+29
| | | | | | |
| * | | | | | Merge pull request #4979 from ripopov/fix-tests-mingw-w64Adam Cozzette2018-07-311-0/+7
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | tests: fix link failure and stack overflow on Mingw w64
| | * | | | | | tests: fix link failure and stack overflow on Mingw w64Roman Popov2018-07-301-0/+7
| |/ / / / / /
| * | | | | | Ignore unknown enum received in json when ignoreUnknownFields flag is set ↵vijay-bhatt2018-07-302-6/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (#4825) * Ignore unknown enum received in json when ignoreUnknownFields flag is set.
| * | | | | | Merge pull request #4974 from BSBandme/fix_benchmarkYilun Chong2018-07-301-2/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | fix third_party/benchmark submodule init
| | * | | | | | fix third_party/benchmark initYilun Chong2018-07-271-2/+1
| | | |_|_|/ / | | |/| | | |
| * | | | | | Update third party RPC implementations list (#4977)Petros Pissias2018-07-301-0/+1
| | | | | | | | | | | | | | | | | | | | | I have added the xsrpcj RPC implementation for java
| * | | | | | Updated release documentation (#4973)Adam Cozzette2018-07-301-2/+4
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I made a few small fixes to the documentation related to publishing protoc artifacts: - The target directory for Mac should be called osx instead of macos. - There needs to be a directory for aarch_64. - We need to avoid calling "mvn clean" inside the protoc-artifacts directory, since that will delete the contents of the target/ subdirectory.
| * | | | | Give a specific category to each test. (#4965)Paul Yang2018-07-2715-80/+111
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Give a unique category to each test. This change introduce a TestCategory enum to ConformanceRequest. Existing tests are divided into three categories: binary format test, json format test and json format (ignore unknown when parsing) test. For the previous two categories, there is no change to existing testee programs. For tests with the last category, testee programs should either enable ignoring unknown field during json parsing or skip the test. * Fix python test * Fix java * Fix csharp * Update document * Update csharp generated code
| * | | | Add conformance test for php c back (#4966)Paul Yang2018-07-262-7/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add conformance test for php c back php c extension has different result for conformance test for different php version and architecture. Try to add conformance back for php 7.1 c extension first. * Disable conformance test for c extension on 32-bit architecture 32-bit and 64-bit have different failing tests * Fix typo
| * | | | Store the class object itself (#4927)Jonathan Haber2018-07-232-4/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Store the class object itself * Add test for backwards compatibility * Rename and add test * Add comments
| * | | | Merge pull request #4956 from mkosieradzki/patch-1Feng Xiao2018-07-231-0/+3
| |\ \ \ \ | | | | | | | | | | | | Added support for Visual Studio 2017 in gitignore
| | * | | | Added support for Visual Studio 2017 in gitignoremkosieradzki2018-07-221-0/+3
| | | | | |
| * | | | | pyext needs c++11 in linux and mac. (#4930)Arun Olappamanna Vasudevan2018-07-231-6/+1
| | | | | |
| * | | | | Update Composer config in PHP module (#3829)Timothy Younger2018-07-231-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Prevents installation of `phpunit/phpunit:^6` because the test cases in this project require `\PHPUnit_Framework_TestCase` which was removed in v6. Moves generated PHP classes for tests into autoload-dev so that they are not referenced in the dist autoload. Adds Composer scripts to run protoc with and without grpc. * update composer test target to use the same commands as generate_php_test_proto in tests.sh
| * | | | | Remove/replace travis references (#4953)Feng Xiao2018-07-226-96/+4
| |/ / / / | | | | | | | | | | | | | | | * Remove/replace travis references.
| * | | | Update options.md (#4952)Ryland Degnan2018-07-211-0/+4
| | | | | | | | | | | | | | | Added Netifi Proteus to Registered Extensions
* | | | | Down-integrate from google3.Feng Xiao2018-08-08443-19369/+30331
|/ / / /
* | | | php: Added nanosecond support for Timestamp (#3972)Leonard Hecker2018-07-206-38/+83
| | | | | | | | | | | | | | | | | | | | | | | | * php: Added nanosecond support for Timestamp * php: Fixed compatibility test