deannagarcia
585583316e
Merge pull request #12633 from deannagarcia/22.x
...
Cherrypick changes for 22.4
2 years ago
Deanna Garcia
2399885f33
Fix merge
2 years ago
Deanna Garcia
8c4152a7f3
Update abseil dependency and reorder dependencies to ensure we use the version specified in protobuf_deps.
...
PiperOrigin-RevId: 528838071
2 years ago
Adam Cozzette
177411a88c
Merge pull request #12634 from acozzette/cherrypick-musttail-22
...
Turn off `clang::musttail` on i386
2 years ago
Adam Cozzette
5381f40506
Turn off `clang::musttail` on i386
...
We found last week that Clang's support for `musttail` on 32-bit Linux does not
seem to work reliably, so let's disable it for now.
PiperOrigin-RevId: 528817403
2 years ago
Deanna Garcia
8b81deb3b5
Fix bug in _internal_copy_files where the rule would fail in downstream repositories.
...
Taken from https://github.com/protocolbuffers/upb/blob/main/bazel/protobuf.patch#L42
Fixes https://github.com/protocolbuffers/protobuf/issues/12620 .
PiperOrigin-RevId: 528586464
2 years ago
deannagarcia
91d1bcbe40
Merge pull request #12622 from deannagarcia/22.x
...
fix(libprotoc): export useful symbols from .so
2 years ago
Carlos O'Ryan
860fbf10c7
fix(libprotoc): export useful symbols from .so
2 years ago
Mike Kruskal
238d2507a8
Add -ex switch to all docker bash commands. ( #12602 )
...
Without this, certain failures will be silently ignored.
PiperOrigin-RevId: 527718574
2 years ago
Mike Kruskal
b05ee4f010
Bump utf8_range to version with working pkg-config ( #12584 )
...
* Mark update script executable
* Squashed 'third_party/utf8_range/' changes from 72c943dea..cd1507d14
cd1507d14 Fix typo in pkg-config file to properly link the utf8_range libraries
3f179d134 Add pkg-config file declaring Abseil dependency of utf8_range
git-subtree-dir: third_party/utf8_range
git-subtree-split: cd1507d1479815fbcd8ff24dc05a978a62098bae
2 years ago
Mike Kruskal
2d48c603b0
Merge pull request #12553 from protocolbuffers/btree-22
...
Fix btree issues in map tests
2 years ago
Mike Kruskal
94c33e39af
Switch to protobuf-ci for new test
2 years ago
Mike Kruskal
d379c083cb
Fix btree issue in map tests.
...
Without any weak ordering, btree_map fails to compile on windows 2022.
Closes #12289
PiperOrigin-RevId: 527019995
2 years ago
Mike Kruskal
09a8d61378
Merge pull request #12542 from protocolbuffers/pkgconfig-22
...
Fix declared dependencies for pkg-config
2 years ago
Mike Kruskal
2c55945fc5
Fix declared dependencies for pkg-config
2 years ago
Matt Fowles Kulukundis
2496b98697
Merge pull request #12487 from protocolbuffers/test_kfm
...
Ensure the ObjC runtime builds for Apple Silicon.
2 years ago
Thomas Van Lenten
1f1bd79d33
Ensure the ObjC runtime builds for Apple Silicon.
...
Github doesn't currently have Apple Silicon runners, but we can build for
the target to atleast ensure things are building.
PiperOrigin-RevId: 524929865
2 years ago
deannagarcia
8cfd30fd66
Merge pull request #12459 from protocolbuffers/22.x-202304122338
...
Update version numbers for 22.3 release
2 years ago
Protobuf Team Bot
5bc5cd29c9
Updating version.json to: 22.4-dev
2 years ago
Protobuf Team Bot
482156c0f9
Updating version.json and repo version numbers to: 22.3
2 years ago
deannagarcia
69776b0b0e
Merge pull request #12457 from deannagarcia/updateDep
...
Update UPB dep for 22.3 release
2 years ago
Deanna Garcia
553422572d
Update UPB dep
2 years ago
deannagarcia
21b4fd581f
Merge pull request #12453 from protocolbuffers/deannagarcia-patch-5
...
Fix .gitmodules to use the correct absl branch
2 years ago
deannagarcia
f51da1fe66
Fix .gitmodules to use the correct absl branch
2 years ago
Joshua Haberman
5ddb1fc609
Remove ODR violation from WKT codegen ( #12406 ) ( #12419 )
...
* Remove ODR violation from WKT codegen (#12406 )
Closes #12406
COPYBARA_INTEGRATE_REVIEW=https://github.com/protocolbuffers/protobuf/pull/12406 from mkruskal-google:wkt 1c6748e6aa
PiperOrigin-RevId: 522418175
* Removed legacy target.
---------
Co-authored-by: Mike Kruskal <mkruskal@google.com>
2 years ago
deannagarcia
f1c7820c9b
Suppress -Wunused-parameter warning for GCC and clang. ( #12355 )
...
* Suppress -Wunused-parameter warning for GCC and clang.
Closes https://github.com/protocolbuffers/protobuf/issues/12313
PiperOrigin-RevId: 520066451
* Remove unintended cherrypicked line
2 years ago
deannagarcia
58ecf38aa5
Merge pull request #12303 from protocolbuffers/deannagarcia-patch-4
...
Add codespell exceptions
2 years ago
deannagarcia
cb009b29fa
Merge pull request #12301 from mkruskal-google/cmake-fix
...
Only include utf8_range if it hasn't been included already
2 years ago
deannagarcia
6e624e4f6b
Add codespell exceptions
...
Codespell is failing on 22.x mostly because there were changes made to this file in main that weren't added to 22.x. This adds the extra exceptions.
2 years ago
Mike Kruskal
c4005f2c92
Only include utf8_range if it hasn't been included already
...
PiperOrigin-RevId: 518361290
2 years ago
Mike Kruskal
777df3d27e
Merge pull request #12276 from mkruskal-google/gtest-dep
...
Remove erroneous dependencies @com_google_googletest//:gtest and @com…
2 years ago
Preston Van Loon
27d2d2911d
Remove erroneous dependencies @com_google_googletest//:gtest and @com_google_googletest//:gtest_main from //src/google/protobuf/json:parser ( #12267 )
...
Downstream bazel projects that depend on protoc would need to provide googletest dependencies when it should not be necessary to do so.
Fixes #11409
Closes #12267
COPYBARA_INTEGRATE_REVIEW=https://github.com/protocolbuffers/protobuf/pull/12267 from prestonvanloon:remove-erroneous-googletest-dep 09fd163094
PiperOrigin-RevId: 517974450
2 years ago
zhangskz
787fc7ddba
Merge pull request #12199 from protocolbuffers/22.x-202303101751
...
22.x 202303101751
2 years ago
Protobuf Team Bot
653673916c
Updating version.json to: 22.3-dev
2 years ago
Protobuf Team Bot
81f89d509d
Updating version.json and repo version numbers to: 22.2
2 years ago
zhangskz
9540135894
Merge pull request #12194 from deannagarcia/finalPomFixes
...
Add version to intra proto dependencies and add kotlin stdlib dependency
2 years ago
Deanna Garcia
99ed01009f
Add version to intra proto dependencies and add kotlin stdlib dependency
2 years ago
deannagarcia
080e3067b9
Merge pull request #12189 from deannagarcia/poms
...
Add $ back for osgi header
2 years ago
Deanna Garcia
d80c12d322
Add $ back for osgi header
2 years ago
deannagarcia
be7f6b06c0
Merge pull request #12177 from deannagarcia/fixPom
...
Fix pom file errors caused by the extra "$"
2 years ago
Deanna Garcia
8ac2337595
Remove $ in pom files
2 years ago
deannagarcia
832a19627a
Merge pull request #12168 from protocolbuffers/22.x-202303072154
...
Update version numbers for 22.1 release
2 years ago
Protobuf Team Bot
9c02d4c0de
Updating version.json to: 22.2-dev
2 years ago
Protobuf Team Bot
839e8d25ea
Updating version.json and repo version numbers to: 22.1
2 years ago
deannagarcia
b869151779
Merge pull request #12165 from deannagarcia/fixWindowsExe
...
Condition executable name on build system
2 years ago
Deanna Garcia
5476b46af3
Condition executable name on build system
2 years ago
Mike Kruskal
b3733bfc74
Fix released protoc path
...
PiperOrigin-RevId: 514551233
2 years ago
Mike Kruskal
f6c0767a28
Rename protoc_static for release
...
PiperOrigin-RevId: 514500346
2 years ago
deannagarcia
3db15d3a82
Merge pull request #12152 from protocolbuffers/cherrypickStatic
...
Add release tests for statically linked binaries
2 years ago
Mike Kruskal
8a07f45293
Add release tests for statically linked binaries
...
For now, this only covers linux on the two architectures we have testing support for. However, it serves as a good sanity check and can be expanded in the future.
PiperOrigin-RevId: 514449399
2 years ago