From 9ac7f3bb65c070bd98d1cf14cdd52972244dcc0f Mon Sep 17 00:00:00 2001 From: null Date: Wed, 18 Dec 2024 14:57:00 +0000 Subject: [PATCH] Publish protocolbuffers/protobuf@v29.2 --- modules/protobuf/29.2/MODULE.bazel | 182 ++++++++++++++++++++++++++++ modules/protobuf/29.2/presubmit.yml | 36 ++++++ modules/protobuf/29.2/source.json | 5 + modules/protobuf/metadata.json | 3 +- 4 files changed, 225 insertions(+), 1 deletion(-) create mode 100644 modules/protobuf/29.2/MODULE.bazel create mode 100644 modules/protobuf/29.2/presubmit.yml create mode 100644 modules/protobuf/29.2/source.json diff --git a/modules/protobuf/29.2/MODULE.bazel b/modules/protobuf/29.2/MODULE.bazel new file mode 100644 index 00000000000..3c3f051adec --- /dev/null +++ b/modules/protobuf/29.2/MODULE.bazel @@ -0,0 +1,182 @@ +# TODO: migrate all dependencies from WORKSPACE to MODULE.bazel +# https://github.com/protocolbuffers/protobuf/issues/14313 + +module( + name = "protobuf", + version = "29.2", # Automatically updated on release + 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.7.0", +) + +bazel_dep( + name = "jsoncpp", + version = "1.9.5", +) + +bazel_dep( + name = "rules_cc", + version = "0.0.16", +) + +bazel_dep( + name = "rules_fuzzing", + version = "0.5.2", +) + +bazel_dep( + name = "rules_java", + version = "7.12.2", +) + +bazel_dep( + name = "rules_jvm_external", + version = "6.3", +) + +bazel_dep( + name = "rules_kotlin", + version = "1.9.6", +) + +bazel_dep( + name = "rules_license", + version = "1.0.0", +) + +bazel_dep( + name = "rules_pkg", + version = "1.0.1", +) + +bazel_dep( + name = "rules_python", + version = "0.28.0", +) + +bazel_dep( + name = "platforms", + version = "0.0.8", +) + +bazel_dep( + name = "zlib", + version = "1.3.1", +) + +bazel_dep( + name = "bazel_features", + version = "1.17.0", + repo_name = "proto_bazel_features", +) + +bazel_dep( + name = "rules_shell", + version = "0.2.0" +) + +# Proto toolchains +register_toolchains("//bazel/private/toolchains:all") + +SUPPORTED_PYTHON_VERSIONS = [ + "3.8", + "3.9", + "3.10", + "3.11", + "3.12", +] + +python = use_extension("@rules_python//python/extensions:python.bzl", "python") + +[ + python.toolchain( + is_default = python_version == SUPPORTED_PYTHON_VERSIONS[-1], + python_version = python_version, + ) + for python_version in SUPPORTED_PYTHON_VERSIONS +] + +use_repo( + python, + system_python = "python_{}".format(SUPPORTED_PYTHON_VERSIONS[-1].replace(".", "_")), +) + +pip = use_extension("@rules_python//python/extensions:pip.bzl", "pip") + +[ + pip.parse( + hub_name = "pip_deps", + python_version = python_version, + requirements_lock = "//python:requirements.txt", + ) + for python_version in SUPPORTED_PYTHON_VERSIONS +] + +use_repo(pip, "pip_deps") + +maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven") + +maven.install( + name = "protobuf_maven", + artifacts = [ + "com.google.caliper:caliper:1.0-beta-3", + "com.google.code.findbugs:jsr305:3.0.2", + "com.google.code.gson:gson:2.8.9", + "com.google.errorprone:error_prone_annotations:2.5.1", + "com.google.j2objc:j2objc-annotations:2.8", + "com.google.guava:guava:32.0.1-jre", + "com.google.guava:guava-testlib:32.0.1-jre", + "com.google.truth:truth:1.1.2", + "junit:junit:4.13.2", + "org.mockito:mockito-core:4.3.1", + "biz.aQute.bnd:biz.aQute.bndlib:6.4.0", + "info.picocli:picocli:4.6.3", + ], + repositories = [ + "https://repo1.maven.org/maven2", + "https://repo.maven.apache.org/maven2", + ], +) + +use_repo(maven, "protobuf_maven") + +# Development dependencies +bazel_dep( + name = "googletest", + version = "1.14.0", + dev_dependency = True, + repo_name = "com_google_googletest", +) + +bazel_dep( + name = "rules_buf", + version = "0.3.0", + dev_dependency = True, +) + +bazel_dep( + name = "rules_testing", + version = "0.6.0", + dev_dependency = True, +) + +# rules_proto are needed for @com_google_protobuf_v25.0 used in //compatibility/... tests +bazel_dep( + name = "rules_proto", + version = "4.0.0", + dev_dependency = True, +) diff --git a/modules/protobuf/29.2/presubmit.yml b/modules/protobuf/29.2/presubmit.yml new file mode 100644 index 00000000000..bdb24a1781d --- /dev/null +++ b/modules/protobuf/29.2/presubmit.yml @@ -0,0 +1,36 @@ +matrix: + platform: ["debian10", "macos", "ubuntu2004", "windows"] + bazel: [7.x] + +tasks: + verify_targets: + name: "Verify build targets" + platform: ${{ platform }} + bazel: ${{ bazel }} + build_flags: + - '--host_cxxopt=-std=c++14' + - '--cxxopt=-std=c++14' + build_targets: + - '@protobuf//:protobuf' + - '@protobuf//:protobuf_lite' + - '@protobuf//:protobuf_python' + - '@protobuf//:protobuf_java' + - '@protobuf//:protoc' + - '@protobuf//:test_messages_proto2_cc_proto' + - '@protobuf//:test_messages_proto3_cc_proto' + +bcr_test_module: + module_path: "examples" + matrix: + platform: ["debian10", "macos", "ubuntu2004", "windows"] + bazel: [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: + - "//..." diff --git a/modules/protobuf/29.2/source.json b/modules/protobuf/29.2/source.json new file mode 100644 index 00000000000..287c23e2e56 --- /dev/null +++ b/modules/protobuf/29.2/source.json @@ -0,0 +1,5 @@ +{ + "integrity": "sha256-YMGrS+/p0Kl1wjRLVRG/a0T5HsPhQmyHj1a/MKBYnEM=", + "strip_prefix": "protobuf-29.2", + "url": "https://github.com/protocolbuffers/protobuf/releases/download/v29.2/protobuf-29.2.zip" +} diff --git a/modules/protobuf/metadata.json b/modules/protobuf/metadata.json index 848186f4d50..348eb673c85 100644 --- a/modules/protobuf/metadata.json +++ b/modules/protobuf/metadata.json @@ -127,7 +127,8 @@ "29.0-rc2.bcr.1", "29.0-rc3", "29.0", - "29.1" + "29.1", + "29.2" ], "yanked_versions": { "3.19.0": "CVE-2022-3171 (https://github.com/advisories/GHSA-h4h5-3hr4-j3g2)",