protobuf

Commit Graph

Author	SHA1	Message	Date
Elliotte Rusty Harold	81fc22c8ab	Merge tag 'refs/tags/sync-piper' into sync-stage	3 years ago
Elliotte Rusty Harold	5a9bf6c7de	Sync from Piper @454255492 PROTOBUF_SYNC_PIPER	3 years ago
Elliotte Rusty Harold	9f53ec3996	Merge tag 'refs/tags/sync-piper' into sync-stage	3 years ago
Elliotte Rusty Harold	24dad62f40	Sync from Piper @454225000 PROTOBUF_SYNC_PIPER	3 years ago
Elliotte Rusty Harold	70e2923365	update CHANGE list	3 years ago
Elliotte Rusty Harold	31ba940bfe	Merge tag 'refs/tags/sync-piper' into sync-stage	3 years ago
Elliotte Rusty Harold	ce537e8a3e	Sync from Piper @454206746 PROTOBUF_SYNC_PIPER	3 years ago
Elliotte Rusty Harold	2b19a8062a	update CHANGE list	3 years ago
Elliotte Rusty Harold	f5ba6c8610	Merge tag 'refs/tags/sync-piper' into sync-stage	3 years ago
Elliotte Rusty Harold	9e24b1912e	Sync from Piper @453894829 PROTOBUF_SYNC_PIPER	3 years ago
Elliotte Rusty Harold	4d96482e72	Merge tag 'refs/tags/sync-piper' into sync-stage	3 years ago
Elliotte Rusty Harold	3ba3c6a36f	Sync from Piper @453701696 PROTOBUF_SYNC_PIPER	3 years ago
strangewiz	c0fc2e881b	Remove use of sprintf in strutil.cc (#10112 ) Co-authored-by: Justin Cohen <justincohen@google.com>	3 years ago
secup	d37cbfd448	Update inlined_string_field.h (#10107 ) Modify to #ifdef to prevent certain projects to report warnings are errors. thx u	3 years ago
mkruskal-google	3380463ff8	Deleting python release kokoro setup. This has been replaced by upb's python release (#10055 )	3 years ago
zhangskz	0663080c5a	Revert third party/benchmark commit from Piper integrate and add ignore=dirty to submodule (#10104 ) * Revert change to third_party/benchmark from Piper->Github sync * Add ignore=dirty to third_party/benchmark submodule	3 years ago
Namgoo Lee	e7cc1aa970	remove const from function return type if returning const value (#10101 )	3 years ago
zhangskz	4548b4ac0e	Merge pull request #10103 from zhangskz/sync-stage Integrate from Piper for C++, Java, and Python	3 years ago
Sandy Zhang	f138d5de25	Sync from Piper @452551755 PROTOBUF_SYNC_PIPER	3 years ago
Sandy Zhang	2ad33999ee	Merge tag 'refs/tags/sync-piper' into sync-stage	3 years ago
David L. Jones	67f46d2495	Switch normal macos build to use cmake. (#10092 )	3 years ago
David L. Jones	dc14b4be42	Change update_file_lists.sh to work based on Bazel-generated file lists (#10091 ) This commit changes update_file_lists.sh to use Bazel as the source of truth. Currently, only the cmake build is actually affected, but Automake should be fairly straightforward to convert. The file lists were originally factored out in PR#10027. This commit actually switches over to the Bazel-generated lists.	3 years ago
appledragon	45b7f62b1b	use char to find instead of string (#10094 ) * [Bazel] Add a doc explaining our C++ build systems and distribution archives. (#10073) * use char to find instead of string Co-authored-by: David L. Jones <dlj@google.com>	3 years ago
David L. Jones	bd85edfbd9	[Bazel] Add a doc explaining our C++ build systems and distribution archives. (#10073 )	3 years ago
David L. Jones	74b2c7c7ce	Move cmake file lists into src/file_lists.cmake. (#10027 ) This is in preparation for generating file lists automatically. I am putting the list of files under src/, not under cmake/, so that it will be next to the file list for automake (see #10029). I can certainly put the list back under cmake/, but in general, I think we probably want to move the cmake targets e.g. to src/CMakeLists.txt anyhow.	3 years ago
David L. Jones	c2e99db90b	Add filegroups for test sources and include them in file lists. (#10049 ) These will be used to generate lists of sources for non-Bazel builds.	3 years ago
zhangskz	1ec6f26ce7	Remove expected cmake failure due to missing abseil sources, since ab… (#10089 ) * Remove expected cmake failure due to missing abseil sources, since absl dep was rolled back * Add back cmake.sh run using extracted sources	3 years ago
bttk	85fcd02e32	Remove merge markers from BUILD.bazel and fix incorrect merge (#10084 ) * Remove merge markers from BUILD.bazel * fix build errors	3 years ago
zhangskz	045172f35a	Merge pull request #10072 from protocolbuffers/main-202205272356 Merge 21.x to main after 21.1 release	3 years ago
Dennis Shao	a11fa4529f	Merge pull request #10059 from shaod2/sync-stage Integrate from Piper for C++, Java, and Python	3 years ago
Sandy Zhang	e16d9348d7	Fix php generator merge to include php revert change from 21.x	3 years ago
Sandy Zhang	15e09f56b0	Fix unsaved merge resolution	3 years ago
Sandy Zhang	258514019f	Merge 21.x into main	3 years ago
zhangskz	55fe00e35e	Merge pull request #10071 from protocolbuffers/21.x-202205272218 Update version.json to 21.2-dev	3 years ago
zhangskz	fd896733a5	Merge branch '21.x' into 21.x-202205272218	3 years ago
Sandy Zhang	6bd7c2e48c	Update version.json to: 21.2-dev	3 years ago
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.	3 years ago
Sandy Zhang	569a0517fa	Updated changelog	3 years ago
Protobuf Team Bot	38e3a11a29	Updating version.json and repo version numbers to: 21.1	3 years ago
Protobuf Team Bot	e73ed1630f	Updating version.json and repo version numbers to: 21.1	3 years ago
zhangskz	5bbb8f7b2c	Update upb commit to include fix for segmentation fault when instantiating field via repeated field assignment (#10066 )	3 years ago
deannagarcia	d4e1c668ad	Merge pull request #10047 from protocolbuffers/temp Update version.json to: 21.1-dev	3 years ago
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).	3 years ago
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.	3 years ago
zhangskz	16a86804c0	Update upb commit/sha256 to include updated python wheel (#10058 )	3 years ago
Dennis Shao	6dd8af4ecf	Sync from Piper @451217119 PROTOBUF_SYNC_PIPER	3 years ago
Dennis Shao	0e8b241eb4	Merge tag 'refs/tags/sync-piper' into sync-stage	3 years ago
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`.	3 years ago
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>	3 years ago
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	3 years ago

1 2 3 4 5 ...

9497 Commits (81fc22c8ab66708c36e551553fe64b99d0e15594) All Branches Search

9497 Commits (81fc22c8ab66708c36e551553fe64b99d0e15594)

All Branches