Skip to content

Commit

Permalink
Move to .bcr.1 instead
Browse files Browse the repository at this point in the history
  • Loading branch information
zhangskz committed Feb 13, 2025
1 parent 9890dcb commit 4efd963
Show file tree
Hide file tree
Showing 5 changed files with 229 additions and 25 deletions.
127 changes: 127 additions & 0 deletions modules/protobuf/30.0-rc1.bcr.1/MODULE.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1,127 @@
# TODO: migrate all dependencies from WORKSPACE to MODULE.bazel
# https://github.com/protocolbuffers/protobuf/issues/14313

module(
name = "protobuf",
version = "30.0-rc1.bcr.1", # 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 = "20240722.0", repo_name = "com_google_absl")
bazel_dep(name = "bazel_skylib", version = "1.7.1")
bazel_dep(name = "jsoncpp", version = "1.9.6")
bazel_dep(name = "rules_apple", version = "3.13.0", repo_name = "build_bazel_rules_apple")
bazel_dep(name = "apple_support", version = "1.15.1", repo_name = "build_bazel_apple_support")
bazel_dep(name = "rules_cc", version = "0.0.17")
bazel_dep(name = "rules_fuzzing", version = "0.5.2")
bazel_dep(name = "rules_java", version = "8.6.1")
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 = "1.0.0")
bazel_dep(name = "rules_rust", version = "0.51.0")
bazel_dep(name = "platforms", version = "0.0.10")
bazel_dep(name = "zlib", version = "1.3.1.bcr.5")
bazel_dep(name = "bazel_features", version = "1.23.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.9",
"3.10",
"3.11",
"3.12",
]

# TODO: Support hermetic / system python in bzlmod.
python = use_extension("@rules_python//python/extensions:python.bzl", "python")

[
python.toolchain(
# Disable root warning for .pyc cache misses since CI runs as root.
# See https://github.com/bazelbuild/rules_python/pull/713
ignore_root_user_error = True,
is_default = python_version == SUPPORTED_PYTHON_VERSIONS[-1],
python_version = python_version,
)
for python_version in SUPPORTED_PYTHON_VERSIONS
]

pip = use_extension("@rules_python//python/extensions:pip.bzl", "pip", dev_dependency = True)

[
pip.parse(
hub_name = "protobuf_pip_deps",
python_version = python_version,
requirements_lock = "//python:requirements.txt",
)
for python_version in SUPPORTED_PYTHON_VERSIONS
]

use_repo(pip, "protobuf_pip_deps")

crate = use_extension("@rules_rust//crate_universe:extension.bzl", "crate", dev_dependency = True)
crate.spec(
package = "googletest",
version = ">0.0.0",
)
crate.spec(
package = "paste",
version = ">=1",
)
crate.from_specs()
use_repo(crate, crate_index = "crates")

maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven", dev_dependency = True)
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.testparameterinjector:test-parameter-injector:1.18",
"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)
bazel_dep(
name = "abseil-py",
version = "2.1.0",
dev_dependency = True,
repo_name = "com_google_absl_py",
)

# For clang-cl configuration
cc_configure = use_extension("@rules_cc//cc:extensions.bzl", "cc_configure_extension")
use_repo(cc_configure, "local_config_cc")

# 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)
Empty file.
68 changes: 68 additions & 0 deletions modules/protobuf/30.0-rc1.bcr.1/presubmit.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
bcr_test_module:
module_path: examples
matrix:
# Removing ubuntu just for this release candidate
platform: ["debian10", "macos"]
bazel: [7.x, 8.x]

tasks:
verify_targets:
name: "Verify build targets"
platform: ${{ platform }}
bazel: ${{ bazel }}
build_flags:
- '--host_cxxopt=-std=c++17'
- '--cxxopt=-std=c++17'
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'
# Separating windows for different c++ build flags.
verify_targets_windows:
name: "Verify windows build targets"
platform: windows
bazel: ${{ bazel }}
build_flags:
- '--cxxopt=/std:c++17'
- '--host_cxxopt=/std:c++17'
- '--extra_execution_platforms=@protobuf//build_defs:x64_windows-clang-cl'
- '--host_platform=@protobuf//build_defs:x64_windows-clang-cl'
- '--extra_toolchains=@local_config_cc//:cc-toolchain-x64_windows-clang-cl'
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:
# Removing ubuntu just for this release candidate
platform: ["debian10", "macos"]
bazel: [7.x, 8.x]
tasks:
run_test_module:
name: "Run test module"
platform: ${{ platform }}
bazel: ${{ bazel }}
build_flags:
- '--host_cxxopt=-std=c++17'
- '--cxxopt=-std=c++17'
build_targets:
- "//..."
run_test_module_windows:
name: "Run windows test module"
platform: windows
bazel: ${{ bazel }}
build_flags:
- '--cxxopt=/std:c++17'
- '--host_cxxopt=/std:c++17'
build_targets:
- "//..."
8 changes: 8 additions & 0 deletions modules/protobuf/30.0-rc1.bcr.1/source.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"integrity": "sha256-p0wGf/NH7knNqhLEz3bbmNIsvL6iOrOBPX1TwGAToWA=",
"patches": {
"remove-redundant-clang-cl-msvc-constraint.patch": "sha256-47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU="
},
"strip_prefix": "protobuf-30.0-rc1",
"url": "https://github.com/protocolbuffers/protobuf/releases/download/v30.0-rc1/protobuf-30.0-rc1.zip"
}
51 changes: 26 additions & 25 deletions modules/protobuf/metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,76 +22,76 @@
"name": "Jerry Berg"
},
{
"do_not_notify": true,
"email": "acozzette@google.com",
"github": "acozzette",
"name": "Adam Cozzette",
"do_not_notify": true
"name": "Adam Cozzette"
},
{
"do_not_notify": true,
"email": "deannagarcia@google.com",
"github": "deannagarcia",
"name": "Deanna Garcia",
"do_not_notify": true
"name": "Deanna Garcia"
},
{
"do_not_notify": true,
"email": "esrauch@google.com",
"github": "esrauchg",
"name": "Em Rauch",
"do_not_notify": true
"name": "Em Rauch"
},
{
"do_not_notify": true,
"email": "haberman@google.com",
"github": "haberman",
"name": "Josh Haberman",
"do_not_notify": true
"name": "Josh Haberman"
},
{
"do_not_notify": true,
"email": "hongshin@google.com",
"github": "honglooker",
"name": "Hong Shin",
"do_not_notify": true
"name": "Hong Shin"
},
{
"do_not_notify": true,
"email": "jatl@google.com",
"github": "JasonLunn",
"name": "Jason Lunn",
"do_not_notify": true
"name": "Jason Lunn"
},
{
"do_not_notify": true,
"email": "jieluo@google.com",
"github": "anandolee",
"name": "Jie Luo",
"do_not_notify": true
"name": "Jie Luo"
},
{
"do_not_notify": true,
"email": "salo@google.com",
"github": "salo",
"name": "Eric Salo",
"do_not_notify": true
"name": "Eric Salo"
},
{
"do_not_notify": true,
"email": "sbenza@google.com",
"github": "sbenzaquen",
"name": "Samuel Benzaquen",
"do_not_notify": true
"name": "Samuel Benzaquen"
},
{
"do_not_notify": true,
"email": "shaod@google.com",
"github": "shaod2",
"name": "Dennis Shao",
"do_not_notify": true
"name": "Dennis Shao"
},
{
"do_not_notify": true,
"email": "theodorerose@google.com",
"github": "theodorerose",
"name": "Theodore Rose",
"do_not_notify": true
"name": "Theodore Rose"
},
{
"do_not_notify": true,
"email": "tonyliaoss@google.com",
"github": "tonyliaoss",
"name": "Tony Liao",
"do_not_notify": true
"name": "Tony Liao"
}
],
"repository": [
Expand Down Expand Up @@ -132,7 +132,8 @@
"29.1",
"29.2",
"29.3",
"30.0-rc1"
"30.0-rc1",
"30.0-rc1.bcr.1"
],
"yanked_versions": {
"3.19.0": "CVE-2022-3171 (https://github.com/advisories/GHSA-h4h5-3hr4-j3g2)",
Expand Down

0 comments on commit 4efd963

Please sign in to comment.