Skip to content

Commit 4a62d91

Browse files
committed
build: update proto dependencies for protobuf v4 compatibility
- Replace cc_wkt_protos with explicit proto targets (any_proto, struct_proto, descriptor_proto, field_mask_proto) - Add missing protobuf dependency to record_parsing_utils - Bump Bazel version from 6.1.0 to 6.5.0 in Dockerfile These changes ensure compatibility with protobuf v4.25.6's new dependency structure.
1 parent 0627616 commit 4a62d91

3 files changed

Lines changed: 12 additions & 5 deletions

File tree

ml_metadata/proto/BUILD

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,22 @@ licenses(["notice"])
2121
ml_metadata_proto_library(
2222
name = "metadata_store_proto",
2323
srcs = ["metadata_store.proto"],
24-
deps = ["@com_google_protobuf//:cc_wkt_protos"],
24+
deps = [
25+
"@com_google_protobuf//:any_proto",
26+
"@com_google_protobuf//:struct_proto",
27+
"@com_google_protobuf//:descriptor_proto",
28+
],
2529
)
2630

2731
ml_metadata_proto_library(
2832
name = "metadata_store_service_proto",
2933
srcs = ["metadata_store_service.proto"],
3034
has_services = 1,
3135
cc_grpc_version = 1,
32-
deps = [":metadata_store_proto"],
36+
deps = [
37+
":metadata_store_proto",
38+
"@com_google_protobuf//:field_mask_proto",
39+
],
3340
)
3441

3542
ml_metadata_proto_library_py(
@@ -69,6 +76,6 @@ ml_metadata_proto_library(
6976
name = "metadata_source_proto",
7077
srcs = ["metadata_source.proto"],
7178
deps = [
72-
"@com_google_protobuf//:cc_wkt_protos",
79+
"@com_google_protobuf//:any_proto",
7380
],
7481
)

ml_metadata/tools/docker_server/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
3636
python3-dev
3737

3838
# Set up Bazel 6.1.0
39-
ENV BAZEL_VERSION 6.1.0
39+
ENV BAZEL_VERSION 6.5.0
4040
WORKDIR /
4141
RUN mkdir /bazel && \
4242
cd /bazel && \

ml_metadata/util/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ cc_library(
9292
hdrs = ["record_parsing_utils.h"],
9393
deps = [
9494
":return_utils",
95-
95+
"@com_google_protobuf//:protobuf",
9696
"@com_google_absl//absl/container:flat_hash_set",
9797
"@com_google_absl//absl/status",
9898
"@com_google_absl//absl/strings",

0 commit comments

Comments
 (0)