From 3b4740d26daaee874f6e4b6568a2e0ca34c51258 Mon Sep 17 00:00:00 2001 From: Tobias Grieger Date: Tue, 12 Nov 2024 17:08:34 +0100 Subject: [PATCH] also replace annotation refs in patch files Error unchanged from last commit. I did remember to `./dev gen bazel`. ``` link: package conflict error: google.golang.org/genproto/googleapis/cloud/location: package imports google.golang.org/genproto/googleapis/api/annotations was compiled with: @org_golang_google_genproto//googleapis/api/annotations:annotations but was linked with: @org_golang_google_genproto_googleapis_api//annotations:annotations ``` --- build/patches/com_github_buchgr_bazel_remote.patch | 4 ++-- build/patches/com_github_grpc_ecosystem_grpc_gateway.patch | 2 +- build/patches/go_googleapis.patch | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/patches/com_github_buchgr_bazel_remote.patch b/build/patches/com_github_buchgr_bazel_remote.patch index f83782dc9e1a..c2de4ac43cd6 100644 --- a/build/patches/com_github_buchgr_bazel_remote.patch +++ b/build/patches/com_github_buchgr_bazel_remote.patch @@ -113,7 +113,7 @@ diff -urN a/genproto/build/bazel/remote/asset/v1/BUILD.bazel b/genproto/build/ba - "@go_googleapis//google/rpc:status_go_proto", - "@io_bazel_rules_go//proto/wkt:duration_go_proto", - "@io_bazel_rules_go//proto/wkt:timestamp_go_proto", -+ "@org_golang_google_genproto//googleapis/api/annotations:go_default_library", ++ "@org_golang_google_genproto_googleapis_api//annotations:go_default_library", + "@org_golang_google_genproto//googleapis/rpc/status:go_default_library", + "@com_github_golang_protobuf//ptypes/duration:go_default_library", + "@com_github_golang_protobuf//ptypes/timestamp:go_default_library", @@ -133,7 +133,7 @@ diff -urN a/genproto/build/bazel/remote/execution/v2/BUILD.bazel b/genproto/buil - "@io_bazel_rules_go//proto/wkt:duration_go_proto", - "@io_bazel_rules_go//proto/wkt:timestamp_go_proto", - "@io_bazel_rules_go//proto/wkt:wrappers_go_proto", -+ "@org_golang_google_genproto//googleapis/api/annotations:go_default_library", ++ "@org_golang_google_genproto_googleapis_api//annotations:go_default_library", + "@org_golang_google_genproto//googleapis/longrunning:go_default_library", + "@org_golang_google_genproto//googleapis/rpc/status:go_default_library", + "@com_github_golang_protobuf//ptypes/duration:go_default_library", diff --git a/build/patches/com_github_grpc_ecosystem_grpc_gateway.patch b/build/patches/com_github_grpc_ecosystem_grpc_gateway.patch index a2256cfcb0df..817e5efa499c 100644 --- a/build/patches/com_github_grpc_ecosystem_grpc_gateway.patch +++ b/build/patches/com_github_grpc_ecosystem_grpc_gateway.patch @@ -40,7 +40,7 @@ index 02aa7d2a8..fd922a156 100644 + "@com_github_golang_protobuf//protoc-gen-go/descriptor:go_default_library", "@io_bazel_rules_go//proto/wkt:compiler_plugin_go_proto", - "@io_bazel_rules_go//proto/wkt:descriptor_go_proto", -+ "@org_golang_google_genproto//googleapis/api/annotations:go_default_library", ++ "@org_golang_google_genproto_googleapis_api//annotations:go_default_library", ], ) diff --git a/build/patches/go_googleapis.patch b/build/patches/go_googleapis.patch index 6ebc6706fd9a..e63566cea164 100644 --- a/build/patches/go_googleapis.patch +++ b/build/patches/go_googleapis.patch @@ -10,7 +10,7 @@ diff -urN a/google/cloud/kms/v1/BUILD.bazel b/google/cloud/kms/v1/BUILD.bazel + "@com_github_golang_protobuf//ptypes/duration:go_default_library", + "@com_github_golang_protobuf//ptypes/timestamp:go_default_library", + "@com_github_golang_protobuf//ptypes/wrappers:go_default_library", -+ "@org_golang_google_genproto//googleapis/api/annotations:go_default_library", ++ "@org_golang_google_genproto_googleapis_api//annotations:go_default_library", + "@org_golang_google_genproto//protobuf/field_mask:go_default_library", ], ) @@ -28,7 +28,7 @@ diff -urN a/google/devtools/build/v1/BUILD.bazel a/google/devtools/build/v1/BUIL + "@com_github_golang_protobuf//ptypes/empty:go_default_library", + "@com_github_golang_protobuf//ptypes/timestamp:go_default_library", + "@com_github_golang_protobuf//ptypes/wrappers:go_default_library", -+ "@org_golang_google_genproto//googleapis/api/annotations:go_default_library", ++ "@org_golang_google_genproto_googleapis_api//annotations:go_default_library", + "@org_golang_google_genproto//protobuf/field_mask:go_default_library", ], )