aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5048 from jozefizso/fix/4579_backport_for_3.6.x3.6.xFeng Xiao2018-08-207-4/+80
|\ | | | | Include version information in Windows binaries (backport #4579 for 3.6.x)
| * Backport the PR #4579 to 3.6.x branchJozef Izso2018-08-157-4/+80
| | | | | | | | Implements #3380
* | Merge pull request #5049 from nehaljwani/backport-4854Adam Cozzette2018-08-162-4/+4
|\ \ | |/ |/| Backport #4854 to 3.6.x
| * Set LIBPROTOBUF_EXPORT on GenericTypeHandler<class google::protobuf::Message>Nehal J Wani2018-08-151-3/+3
| | | | | | | | This should fix https://github.com/google/protobuf/issues/4717
| * Set LIBPROTOBUF_EXPORT on GzipOutputStream::OptionsAdam Cozzette2018-08-151-1/+1
|/ | | | | | | This fixes issue #2610. This was originally fixed in a101fa52895fc2ad83d8b5d610243531b1608a08 , but got reverted by d36c0c538a545fac5d9db6ba65c525246d4efa95
* Python wheel kokoro for windows (#5034)Paul Yang2018-08-133-0/+123
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add kokoro config for building python wheels on windows * Move script to root * Debug * Debug * Change working directory * Add msbuild to path * Debug * Fix python dir name * Debug * Move artifacts to targeted directory * Update artifact directory * Debug * Debug * Automatic generation of version * Reduce file numbers
* Python wheel kokoro for mac (#5017)Paul Yang2018-08-082-0/+55
| | | | | | | | | | | | * Add config for building python wheel on mac * Specify os name * Clean up venv * Debug * Recover old path
* Python wheel kokoro dev (#5002)Paul Yang2018-08-063-0/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add config for building python wheel * Update submodules * Fix setup.py to use c++11 * Fix syntax error * Fix syntax error * Add dir for artifact * Update artifact dirctory * Remove python 3.3 * Clean up virtual env * Clean up env * Test environment * Test env variable * Automatic update version number * Remove dependency on python-wheel branch
* Update php package.xml to 3.6.1 (#5000)Paul Yang2018-08-031-3/+19
|
* Merge pull request #4997 from jtattermusch/backport_nuget_buildingFeng Xiao2018-08-034-2/+18
|\ | | | | Backport building C# nuget to 3.6.x branch
| * upgrade dotnet SDK to 2.1.3 on kokoro linuxJan Tattermusch2018-08-031-1/+1
| |
| * Revert "overcome the global.json constraint with a hack"Jan Tattermusch2018-08-031-9/+0
| | | | | | | | This reverts commit c02346c72aafd1826b0397dbbce4ce04bf252f50.
| * use SDK version available on KokoroJan Tattermusch2018-08-031-1/+1
| |
| * overcome the global.json constraint with a hackJan Tattermusch2018-08-031-0/+9
| |
| * fix build_nuget.batJan Tattermusch2018-08-031-1/+1
| |
| * add scripts for automated building of C# nuget on KokoroJan Tattermusch2018-08-032-0/+16
|/
* 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 #4878 from acozzette/fix-msvc-initializationAdam Cozzette2018-07-0911-319/+132
|\ \ | |/ |/| Fix initialization with Visual Studio
| * Fix initialization with Visual StudioAdam Cozzette2018-07-0611-319/+132
|/ | | | | | | | | | | | It appears that Visual Studio does not work well with std::once_flag because it has a bug causing it to initialize that during dynamic initialization instead of constant initialization. This change works around the problem by using function static initializers instead. @gerben-s originally wrote this change for the Google-internal codebase but I am just cherry-picking it here. This fixes #4773.
* Build ruby gem on kokoro (#4819)Paul Yang2018-06-257-1/+65
| | | | | | | | | | | | | | | | | | | | | | * Install rake compiler * Add kokoro config to build ruby gem on linux * Rename from linix to linux * Fix prepare_build.sh name * Clean up * Install bundler * Install bundler * Use c99 in order to build gem on mingw-32 on ruby 2.0.0 See https://github.com/rake-compiler/rake-compiler-dock/issues/4 * Move c99 config to extcofig.rb
* Rename build_artifacts.cfg to release.cfg (#4818)Paul Yang2018-06-221-0/+0
|
* Add files to build ruby artifact for mac on kokoro (#4814)Paul Yang2018-06-224-0/+98
| | | | | | * Add files to build ruby artifact for mac on kokoro * Move ruby specific stuff to ruby dir
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-26 04:30:19 +0000