Skip to content

Commit ff11eda

Browse files
authored
fix(compute): build with Bazel and MSVC (#12877)
1 parent 5862f09 commit ff11eda

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

ci/gha/builds/windows-bazel.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ io::log_h1 "Get target list for: " "$@"
5555
# on Windows. We need to clean things up before feeding them through bash.
5656
#
5757
# I (coryan@) do not understand why: `//examples` gets converted to `/examples`
58-
# somewhere in the `printf ... | xargs -n 64 bazelisk ...` call. Using `///`
59-
# seems to work.
60-
mapfile -t targets < <(bazelisk "${args[@]}" query -- "$@" | tr -d '\r' | sed 's;//examples;///examples;g' | sort)
58+
# somewhere in the `printf ... | xargs -n 64 bazelisk ...` call. Ditto for
59+
# `//protos`. Using `///` seems to work.
60+
mapfile -t targets < <(bazelisk "${args[@]}" query -- "$@" | tr -d '\r' | sed -e 's;//examples;///examples;g' -e 's;//protos;///protos;g' | sort)
6161

6262
io::log_h1 "Starting Build"
6363
TIMEFORMAT="==> 🕑 bazel test done in %R seconds"

google/cloud/compute/BUILD.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ load(":service_dirs.bzl", "operation_service_dirs", "service_dirs")
5656
hdrs = [":" + service.replace("/v1/", "_hdrs")],
5757
visibility = ["//:__pkg__"],
5858
deps = [
59-
"//protos/google/cloud/compute:google_cloud_cpp_compute_" + service.replace("/v1/", "") + "_cc_proto",
59+
"//protos/google/cloud/compute:" + service.replace("/v1/", "") + "_cc_proto",
6060
"//:common",
6161
"//:grpc_utils",
6262
"//google/cloud:google_cloud_cpp_rest_internal",
@@ -76,7 +76,7 @@ load(":service_dirs.bzl", "operation_service_dirs", "service_dirs")
7676
":google_cloud_cpp_compute_global_organization_operations",
7777
":google_cloud_cpp_compute_region_operations",
7878
":google_cloud_cpp_compute_zone_operations",
79-
"//protos/google/cloud/compute:google_cloud_cpp_compute_" + service.replace("/v1/", "") + "_cc_proto",
79+
"//protos/google/cloud/compute:" + service.replace("/v1/", "") + "_cc_proto",
8080
"//:common",
8181
"//:grpc_utils",
8282
"//google/cloud:google_cloud_cpp_rest_internal",

protos/google/cloud/compute/BUILD.bazel

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ filegroup(
3030
)
3131

3232
proto_library(
33-
name = "google_cloud_cpp_compute_internal_proto",
33+
name = "internal_proto",
3434
srcs = [":internal_protos"],
3535
strip_import_prefix = "/protos",
3636
visibility = [
@@ -44,12 +44,12 @@ proto_library(
4444
)
4545

4646
cc_proto_library(
47-
name = "google_cloud_cpp_compute_internal_cc_proto",
47+
name = "internal_cc_proto",
4848
visibility = [
4949
"//:__pkg__",
5050
"//google/cloud/compute:__pkg__",
5151
],
52-
deps = [":google_cloud_cpp_compute_internal_proto"],
52+
deps = [":internal_proto"],
5353
)
5454

5555
# Service proto targets
@@ -59,15 +59,15 @@ cc_proto_library(
5959
srcs = glob([service + "*.proto"]),
6060
),
6161
proto_library(
62-
name = "google_cloud_cpp_compute_" + service.replace("/v1/", "_proto"),
62+
name = service.replace("/v1/", "_proto"),
6363
srcs = [":" + service.replace("/v1/", "_proto_srcs")],
6464
strip_import_prefix = "/protos",
6565
visibility = [
6666
"//:__pkg__",
6767
"//google/cloud/compute:__pkg__",
6868
],
6969
deps = [
70-
":google_cloud_cpp_compute_internal_proto",
70+
":internal_proto",
7171
"@com_google_googleapis//google/api:annotations_proto",
7272
"@com_google_googleapis//google/api:client_proto",
7373
"@com_google_googleapis//google/api:field_behavior_proto",
@@ -79,11 +79,11 @@ cc_proto_library(
7979
],
8080
),
8181
cc_proto_library(
82-
name = "google_cloud_cpp_compute_" + service.replace("/v1/", "_cc_proto"),
82+
name = service.replace("/v1/", "_cc_proto"),
8383
visibility = [
8484
"//:__pkg__",
8585
"//google/cloud/compute:__pkg__",
8686
],
87-
deps = [":google_cloud_cpp_compute_" + service.replace("/v1/", "_proto")],
87+
deps = [":" + service.replace("/v1/", "_proto")],
8888
),
8989
] for service in service_dirs + operation_service_dirs]

0 commit comments

Comments
 (0)