Commit Graph

9511 Commits

Author SHA1 Message Date
Sandy Zhang
258514019f Merge 21.x into main 2022-05-28 00:06:34 +00:00
zhangskz
55fe00e35e
Merge pull request #10071 from protocolbuffers/21.x-202205272218
Update version.json to 21.2-dev
2022-05-27 23:25:37 +00:00
zhangskz
fd896733a5
Merge branch '21.x' into 21.x-202205272218 2022-05-27 23:24:44 +00:00
Sandy Zhang
6bd7c2e48c Update version.json to: 21.2-dev 2022-05-27 23:19:49 +00:00
Adam Cozzette
7f02c3b16b
Fix continuous aarch64 builds (#10067)
Some of the continuous aarch64 builds started failing yesterday because
the autotools -> CMake change caused the protoc binary to end up in an
unexpected location. This change fixes the problem by putting a symlink
in the src/ directory.
2022-05-27 11:11:05 -07:00
Sandy Zhang
569a0517fa Updated changelog 2022-05-27 14:07:46 -04:00
Protobuf Team Bot
38e3a11a29 Updating version.json and repo version numbers to: 21.1 2022-05-27 14:07:46 -04:00
Protobuf Team Bot
e73ed1630f Updating version.json and repo version numbers to: 21.1 2022-05-27 09:37:14 -07:00
zhangskz
5bbb8f7b2c
Update upb commit to include fix for segmentation fault when instantiating field via repeated field assignment (#10066) 2022-05-27 12:16:33 -04:00
deannagarcia
d4e1c668ad
Merge pull request #10047 from protocolbuffers/temp
Update version.json to: 21.1-dev
2022-05-27 16:02:45 +00:00
David L. Jones
ceaae1b6a3
[Bazel] Add back a filegroup for :well_known_protos. (#10061)
This was removed in #9915, since it is misleadingly named (the set of sources is "well known," but not the same as the Well-Known Types).
2022-05-26 16:32:15 -07:00
Adam Cozzette
3b029b1f4f
Revert "Fix cmake install targets (#9822)" (#10060)
This reverts commit c80808ce1d.

Thix fixes #10045. Somehow the change caused these four .cmake files to
stop being installed:

protobuf-config.cmake
protobuf-config-version.cmake
protobuf-module.cmake
protobuf-options.cmake

After reverting the change, I confirmed that the files are being
installed again.
2022-05-26 14:11:37 -07:00
zhangskz
16a86804c0
Update upb commit/sha256 to include updated python wheel (#10058) 2022-05-26 15:36:41 -04:00
Adam Cozzette
f7e2e0b301
Remove Abseil dependency from CMake build (#10056)
* Revert "Added cmake abseil include guard"

This reverts commit b6ee841d7c.

* Revert "Update CMake configuration to add a dependency on Abseil (#9793)"

This reverts commit e9246cd789.
2022-05-26 12:13:41 -07:00
Adam Cozzette
30f446820d
Add endian.h to includes list (#10057)
Client code is breaking due to missing include.  (endian.h was added in 9e09343 but didn't make it into this list, so it wasn't getting installed)

Co-authored-by: boscosiu <boscosiu@users.noreply.github.com>
2022-05-26 12:09:49 -07:00
mkruskal-google
f2e06fe042
Migrate linux-aarch64 tests away from autotools (#10015)
Autotools support is being deprecated, so this moves some of our kokoro tests to cmake
2022-05-26 09:54:30 -07:00
Deanna Garcia
698d760f8d Update version.json to: 21.1-dev 2022-05-26 01:24:35 +00:00
deannagarcia
e7e8f04a4f
Merge pull request #10044 from protocolbuffers/21.x-202205252102
Update versions and changelog for 21.x
2022-05-25 21:50:17 +00:00
David L. Jones
0e42bf9f58
[Bazel/C++] Split apart protobuf_test rule (#10039)
This splits the `protobuf_test` target into several other test targets, and adds `lite_unittest` and `lite_arena_unittest`, which were missing previously.

[Side note:] I did a pass over the new tests to thin their dependencies, and also split out `lite_test_util` from the existing `test_util`  target. I have left the `protobuf_test` target in place (but empty) for now... it is almost certainly safe to remove, but that can be done in a follow-up to reduce risk from this commit.
2022-05-25 14:28:03 -07:00
Deanna Garcia
7062d0a2d0 Updated changelog 2022-05-25 21:15:04 +00:00
Protobuf Team Bot
59c6ff83e9 Updating version.json and repo version numbers to: 21.0 2022-05-25 13:51:01 -07:00
David L. Jones
34d749df72
Fix headers for protobuf and protobuf_lite so they are the proper lists of files, not just globs. (#10031)
This change makes the headers into actual lists of files, rather than globs. These lists are based on the current cmake definitions.
2022-05-25 12:02:31 -07:00
cjtallman
043ee2e4e6
Adding a DEPENDENCIES option to the protobuf_generate cmake function (#10014) 2022-05-25 11:00:25 -07:00
deannagarcia
6641a420ff
Merge pull request #10024 from Niranjan-B/add-header-search-paths
Add header search paths to protobuf-c++ spec
2022-05-25 10:23:18 -07:00
Joshua Haberman
ec4c19b962
Merge pull request #10036 from haberman/rollback-readonly
Revert "fix: reserve "ReadOnly" keyword for PHP 8.1 and add compatibi…lity (#9633)"
2022-05-24 16:33:50 -07:00
Adam Cozzette
5e7b709564
Revert "Various fixups to warnings flags (#9344)" (#10037)
This reverts commit 448d421250.

Unfortunately we have to revert this because we're finding that it
introduces too much new build log spam for existing proto files that are
out of compliance with the warnings. We might be able to roll it forward
again if we can figure out a way to do so without so many new log
messages.
2022-05-24 15:52:18 -07:00
Joshua Haberman
8984184e54 Revert "fix: reserve "ReadOnly" keyword for PHP 8.1 and add compatibility (#9633)"
This reverts commit eb27c201f1.
2022-05-24 21:06:00 +00:00
David L. Jones
586b72c1ac
[Bazel/C++] Augment cc_dist_library to generate lists of source files (#10026)
This change largely moves internal logic that creates the the `CcFileList` provider from `build_systems.bzl` to `cc_dist_library.bzl`.

There are also some associated changes to the particular `cc_dist_library` targets, since the output didn't really make sense after previous BUILD.bazel refactoring. There is also a target now for `libprotoc`.
2022-05-24 12:31:56 -07:00
Joshua Haberman
0b2cee6486
Merge pull request #10025 from haberman/fix-windows-protoc
Fixed the Windows build of protoc by statically linking deps.
2022-05-23 15:01:04 -07:00
Joshua Haberman
2dc7679cc1 Fixed the Windows build of protoc by statically linking deps. 2022-05-23 20:59:31 +00:00
Niranjan Bhaskar
a5a71fbbdf Add header search paths to protobuf-c++ spec 2022-05-23 16:04:58 -04:00
David L. Jones
bbcc459aa0
[Kokoro/Bazel] Send Bazel build results to BES. (#10008)
This change adds bazel_wrapper.sh, which uses values set by Kokoro to log remotely.
2022-05-20 19:44:51 -07:00
David L. Jones
e5e8378a62
[Bazel] Make the protobuf workspace (nearly) wildcard-buildable. (#10010)
- Add back benchmarks/datasets/BUILD.bazel to dist archive
- Change dist/build_systems.bzl to be compatible with Bazel 4.0.0.

After this, most builds can use //..., with one exception: non-Mac environments must also exclude objectivec:
`bazel build -- //... -//objectivec/...`
2022-05-20 19:33:42 -07:00
deannagarcia
6d2827b377
Merge pull request #10019 from deannagarcia/fixCocoapods
Fix podspecs
2022-05-20 15:54:24 -07:00
deannagarcia
599b08ab1c
Merge pull request #10018 from protocolbuffers/main-202205201724
Merge 21.x into Main
2022-05-20 15:54:17 -07:00
Deanna Garcia
942cec077a Fix podspecs 2022-05-20 21:43:48 +00:00
Deanna Garcia
38f0bd4d15 Fix bazel builds 2022-05-20 21:28:55 +00:00
David L. Jones
bb27447f42
[Bazel] Use pyenv to select Python 3.9.5 on our linux/bazel builds. (#10009)
We still need to use python2 when running autotools.
2022-05-20 13:04:18 -07:00
Deanna Garcia
cdfd60f63d Fix podspec errors 2022-05-20 18:03:26 +00:00
Deanna Garcia
1407efb39f Fix merge conflict 2022-05-20 17:45:47 +00:00
Deanna Garcia
da481978af Merge 21.x back to main 2022-05-20 17:39:11 +00:00
deannagarcia
6673c7c48f
Merge pull request #10006 from protocolbuffers/21.x-202205200038
Update version.json to: 21.0-dev
2022-05-20 10:17:11 -07:00
Chan Wen Xu
30f6c7851b
Add protoc-gen-xo to global extension registry (#9997) 2022-05-20 05:51:18 -07:00
David L. Jones
450d24ca82
Merge pull request #10005 from dlj-NaN/sync-stage
Integrate from Piper for C++, Java, and Python
2022-05-19 18:56:40 -07:00
Deanna Garcia
ecaeadeced Update version.json to: 21.0-dev 2022-05-20 00:38:39 +00:00
David L. Jones
42ff77e55f Restore erroneous changes to Makefile.am. 2022-05-19 17:26:06 -07:00
David L. Jones
053f698e90 Adjust constexpr qualifiers so they work in gcc < 4.9. 2022-05-19 16:57:17 -07:00
David L. Jones
7f2368933a Re-generate csharp and php golden proto files after changes to descriptor.proto. 2022-05-19 16:02:36 -07:00
David L. Jones
d0a4dc7661 Update CHANGES.txt. 2022-05-19 14:46:31 -07:00
David L. Jones
d87d99d931 Merge tag 'refs/tags/sync-piper' into sync-stage 2022-05-19 14:43:18 -07:00