-
Notifications
You must be signed in to change notification settings - Fork 251
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
protobuf@27.0-rc2 #1982
Merged
fmeum
merged 10 commits into
bazelbuild:main
from
protocolbuffers:protocolbuffers/protobuf@v27.0-rc2-632dfd21
May 14, 2024
Merged
protobuf@27.0-rc2 #1982
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
384b8cd
Publish protocolbuffers/protobuf@v27.0-rc2
haberman 9ce9019
Add bazel versions to presubmit.yml
zhangskz 9a43ba6
Remove extra version from MODULE.bazel
zhangskz 6ce4b33
Remove extra version from patches
zhangskz 0641534
Update patch sha
zhangskz 82fb861
Remove empty patches
zhangskz 70950c7
Add c++14 build flags
zhangskz 1de5f7e
Try updating to debian 11 to see if this avoids old warning (that wil…
zhangskz 7972f39
Remove debian presubmit due to spurious warning treated as error
zhangskz 4ae42c9
Merge branch 'main' into protocolbuffers/protobuf@v27.0-rc2-632dfd21
zhangskz File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
# TODO: migrate all dependencies from WORKSPACE to MODULE.bazel | ||
# https://github.com/protocolbuffers/protobuf/issues/14313 | ||
PROTOBUF_VERSION = "27.0-rc2" | ||
|
||
module( | ||
name = "protobuf", | ||
version = PROTOBUF_VERSION, | ||
compatibility_level = 1, | ||
repo_name = "com_google_protobuf", | ||
) | ||
|
||
# LOWER BOUND dependency versions. | ||
# Bzlmod follows MVS: | ||
# https://bazel.build/versions/6.0.0/build/bzlmod#version-resolution | ||
# Thus the highest version in their module graph is resolved. | ||
bazel_dep(name = "abseil-cpp", version = "20230802.0.bcr.1", repo_name = "com_google_absl") | ||
bazel_dep(name = "bazel_skylib", version = "1.4.1") | ||
bazel_dep(name = "jsoncpp", version = "1.9.5") | ||
bazel_dep(name = "rules_cc", version = "0.0.9") | ||
bazel_dep(name = "rules_java", version = "5.3.5") | ||
bazel_dep(name = "rules_jvm_external", version = "5.1") | ||
bazel_dep(name = "rules_pkg", version = "0.7.0") | ||
bazel_dep(name = "rules_python", version = "0.10.2") | ||
bazel_dep(name = "platforms", version = "0.0.8") | ||
bazel_dep(name = "zlib", version = "1.2.11") | ||
|
||
# TODO: remove after toolchain types are moved to protobuf | ||
bazel_dep(name = "rules_proto", version = "4.0.0") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
matrix: | ||
platform: ["macos", "ubuntu2004", "windows"] | ||
bazel: [6.x, 7.x] | ||
|
||
tasks: | ||
verify_targets: | ||
name: "Verify build targets" | ||
fmeum marked this conversation as resolved.
Show resolved
Hide resolved
|
||
platform: ${{ platform }} | ||
bazel: ${{ bazel }} | ||
build_flags: | ||
- '--host_cxxopt=-std=c++14' | ||
- '--cxxopt=-std=c++14' | ||
build_targets: | ||
- '@protobuf//:protobuf' | ||
- '@protobuf//:protobuf_lite' | ||
- '@protobuf//:protoc' | ||
- '@protobuf//:test_messages_proto2_cc_proto' | ||
- '@protobuf//:test_messages_proto3_cc_proto' | ||
|
||
bcr_test_module: | ||
module_path: "examples" | ||
matrix: | ||
platform: ["macos", "ubuntu2004", "windows"] | ||
bazel: [6.x, 7.x] | ||
tasks: | ||
run_test_module: | ||
name: "Run test module" | ||
platform: ${{ platform }} | ||
bazel: ${{ bazel }} | ||
build_flags: | ||
- '--host_cxxopt=-std=c++14' | ||
- '--cxxopt=-std=c++14' | ||
build_targets: | ||
- "//..." |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
{ | ||
"integrity": "sha256-mqdQp9CnPiWLXGsXlHqHYEQk2k5yczEWMEW0B0ZDnBw=", | ||
"strip_prefix": "protobuf-27.0-rc2", | ||
"url": "https://github.com/protocolbuffers/protobuf/releases/download/v27.0-rc2/protobuf-27.0-rc2.zip", | ||
"patch_strip": 1 | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,25 +1,37 @@ | ||
{ | ||
"homepage": "https://github.com/protocolbuffers/protobuf", | ||
"maintainers": [ | ||
{ | ||
"email": "bcr-maintainers@bazel.build", | ||
"name": "No Maintainer Specified" | ||
"homepage": "https://github.com/protocolbuffers/protobuf", | ||
"maintainers": [ | ||
{ | ||
"email": "sandyzhang@google.com", | ||
"github": "zhangskz", | ||
"name": "Sandy Zhang" | ||
}, | ||
{ | ||
"email": "mkruskal@google.com", | ||
"github": "mkruskal-google", | ||
"name": "Mike Kruskal" | ||
}, | ||
{ | ||
"email": "gberg@google.com", | ||
"github": "googleberg", | ||
"name": "Jerry Berg" | ||
} | ||
], | ||
"repository": [ | ||
"github:protocolbuffers/protobuf" | ||
], | ||
"versions": [ | ||
"3.19.0", | ||
"3.19.2", | ||
"3.19.6", | ||
"21.7", | ||
"23.1", | ||
"26.0", | ||
"26.0.bcr.1", | ||
"27.0-rc2" | ||
], | ||
"yanked_versions": { | ||
"3.19.0": "CVE-2022-3171 (https://github.com/advisories/GHSA-h4h5-3hr4-j3g2)", | ||
"3.19.2": "CVE-2022-3171 (https://github.com/advisories/GHSA-h4h5-3hr4-j3g2)" | ||
} | ||
], | ||
"repository": [ | ||
"github:protocolbuffers/protobuf" | ||
], | ||
"versions": [ | ||
"3.19.0", | ||
"3.19.2", | ||
"3.19.6", | ||
"21.7", | ||
"23.1", | ||
"26.0", | ||
"26.0.bcr.1" | ||
], | ||
"yanked_versions": { | ||
"3.19.0": "CVE-2022-3171 (https://github.com/advisories/GHSA-h4h5-3hr4-j3g2)", | ||
"3.19.2": "CVE-2022-3171 (https://github.com/advisories/GHSA-h4h5-3hr4-j3g2)" | ||
} | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this really the plan? Afaik toolchain types can't be aliased, so this would be somewhat painful.