fix go builds

bazelbuild · Jul 23, 2023 · 812c918 · 812c918
1 parent d7aa648
commit 812c918
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 84 deletions.
diff --git a/WORKSPACE b/WORKSPACE
@@ -94,7 +94,6 @@ remote_apis_go_deps()
 # Needed for the googleapis protos.
 http_archive(
     name = "googleapis",
-    build_file = "BUILD.googleapis",
     sha256 = "b28c13e99001664eac5f1fb81b44d912d19fbc041e30772263251da131f6573c",
     strip_prefix = "googleapis-bb964feba5980ed70c9fb8f84fe6e86694df65b0",
     urls = ["https://github.com/googleapis/googleapis/archive/bb964feba5980ed70c9fb8f84fe6e86694df65b0.zip"],

diff --git a/build/bazel/remote/asset/v1/BUILD b/build/bazel/remote/asset/v1/BUILD
@@ -11,9 +11,9 @@ proto_library(
         "//build/bazel/remote/execution/v2:remote_execution_proto",
         "@com_google_protobuf//:duration_proto",
         "@com_google_protobuf//:timestamp_proto",
-        "@googleapis//:google_api_annotations_proto",
-        "@googleapis//:google_api_http_proto",
-        "@googleapis//:google_rpc_status_proto",
+        "@googleapis//google/api:annotations_proto",
+        "@googleapis//google/api:http_proto",
+        "@googleapis//google/rpc:status_proto",
     ],
 )
 

diff --git a/build/bazel/remote/asset/v1/go/BUILD b/build/bazel/remote/asset/v1/go/BUILD
@@ -10,8 +10,8 @@ go_proto_library(
     proto = "//build/bazel/remote/asset/v1:remote_asset_proto",
     deps = [
         "//build/bazel/remote/execution/v2:remote_execution_go_proto",
-        "@go_googleapis//google/api:annotations_go_proto",
-        "@go_googleapis//google/rpc:status_go_proto",
+        "@org_golang_google_genproto//googleapis/api/annotations",
+        "@org_golang_google_genproto//googleapis/rpc/status",
     ],
 )
 

diff --git a/external/BUILD.googleapis b/external/BUILD.googleapis