Skip to content

Commit

Permalink
BUILD.bazel: different package path for annotations pkg
Browse files Browse the repository at this point in the history
Similar but different error:

```
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
```

Compare with the original:

```
link: package conflict error: cloud.google.com/go/pubsub/apiv1/pubsubpb: 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
```
  • Loading branch information
tbg committed Nov 12, 2024
1 parent c289c43 commit f2079d2
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ exports_files([
# gazelle:resolve proto proto gogoproto/gogo.proto @com_github_gogo_protobuf//gogoproto:gogo_proto
# gazelle:resolve proto go gogoproto/gogo.proto @com_github_gogo_protobuf//gogoproto
# gazelle:resolve proto proto google/api/annotations.proto @go_googleapis//google/api:annotations_proto
# gazelle:resolve proto go google/api/annotations.proto @org_golang_google_genproto//googleapis/api/annotations:go_default_library
# gazelle:resolve proto go google/api/annotations.proto @org_golang_google_genproto_googleapis_api//annotations:go_default_library
# gazelle:resolve proto io/prometheus/client/metrics.proto @com_github_prometheus_client_model//io/prometheus/client:io_prometheus_client_proto
# gazelle:resolve proto go io/prometheus/client/metrics.proto @com_github_prometheus_client_model//go
# gazelle:resolve go github.com/prometheus/client_model/go @com_github_prometheus_client_model//go
Expand Down
2 changes: 1 addition & 1 deletion pkg/server/serverpb/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ go_proto_library(
# NB: The grpc-gateway compiler injects a dependency on the descriptor
# package that Gazelle isn't prepared to deal with.
"@com_github_golang_protobuf//descriptor:go_default_library_gen", # keep
"@org_golang_google_genproto//googleapis/api/annotations:go_default_library",
"@org_golang_google_genproto_googleapis_api//annotations:go_default_library",
],
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/ts/tspb/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,6 @@ go_proto_library(
"//pkg/roachpb",
"@com_github_gogo_protobuf//gogoproto",
"@com_github_golang_protobuf//descriptor:go_default_library_gen", # keep
"@org_golang_google_genproto//googleapis/api/annotations:go_default_library",
"@org_golang_google_genproto_googleapis_api//annotations:go_default_library",
],
)

0 comments on commit f2079d2

Please # to comment.