aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'google/master' into integration_baseintegration_baseFeng Xiao2018-08-094-64/+7
|\
| * Merge pull request #5027 from xfxyjwf/jenkinsFeng Xiao2018-08-093-63/+6
| |\ | | | | | | Cleanup kokoro scripts.
| | * Cleanup kokoro scripts.Feng Xiao2018-08-093-63/+6
| |/ | | | | | | | | | | | | | | | | Changes: 1. Remove stuff no longer needed. Lots of the heavy lifting were there because we were running our own jenkins cluster and had to manage all the test logs ourselves. Now they are useless. 2. Change "-j2" to "-j4" to speed up the test a little bit. Kokoro machines have 4 logic CPUs according to their spec.
| * Merge pull request #5020 from brian-peloton/masterFeng Xiao2018-08-081-1/+1
| |\ | | | | | | Fix broken test of const repeated field iterators
| | * Fix broken test of const repeated field iteratorsBrian Silverman2018-08-081-1/+1
| |/ | | | | | | | | | | The old version had a NOP for loop, which doesn't make sense. I'm pretty sure this was the original intention. Newer GCC's -Wunused-but-set-variable flags the old version.
* | Update generated descriptors.integrationFeng Xiao2018-08-0815-65/+243
| |
* | Merge master branch.Feng Xiao2018-08-0885-379/+525
|\|
| * Merge pull request #4981 from BSBandme/fix_js_skipgroupYilun Chong2018-08-083-9/+21
| |\ | | | | | | Fix js reader.js's skipGroup
| | * fixYilun Chong2018-08-011-1/+6
| | |
| | * fixYilun Chong2018-08-011-1/+6
| | |
| | * fixYilun Chong2018-08-011-2/+4
| | |
| | * fixYilun Chong2018-07-312-1/+1
| | |
| | * Fix js reader.js's skipGroupYilun Chong2018-07-313-8/+8
| | |
| * | Merge pull request #5013 from prSquirrel/fix-typo-field-mask-treeFeng Xiao2018-08-071-1/+1
| |\ \ | | | | | | | | Fix typo in FieldMaskTree.java warning
| | * | Fix typo in FieldMaskTree.java warningAleksej Kazmin2018-08-071-1/+1
| | | |
| * | | Merge pull request #5010 from batradhruv/4593Adam Cozzette2018-08-0723-148/+148
| |\ \ \ | | |/ / | |/| | #4593 Replace all occurrences of "NULL" to nullptr in src/google/proto…
| | * | 4593 Replace all occurrences of "NULL" to nullptr in src/google/protobug/stubsDhruv2018-08-0723-148/+148
| | | |
| * | | Add header need for module maps.dmaclach2018-08-061-0/+1
| | | | | | | | | | | | If you make up a module map for Objective C protocol buffers, the compiler will complain about missing a declaration for GPBUnknownFieldSet which is used in this file.
| * | | Merge pull request #5005 from finaldie/python.gitignoreFeng Xiao2018-08-061-1/+1
| |\ \ \ | | |/ / | |/| | Ignore python .egg file to make git status clean #5004
| | * | Ignore python .egg file to make git status clean #5004Yuzhang Hu2018-08-051-1/+1
| |/ /
| * | adding of hyperlink of the PHP (#4985)johnlow952018-08-021-1/+1
| | |
| * | Merge pull request #4990 from acozzette/aarch64-buildAdam Cozzette2018-08-012-8/+13
| |\ \ | | | | | | | | Added support for building the aarch64 and ppcle64 protoc binaries with Kokoro
| | * | 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.
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-03 18:31:59 +0000