-
Notifications
You must be signed in to change notification settings - Fork 3.8k
Comparing changes
Open a pull request
base repository: cockroachdb/cockroach
base: master
head repository: tbg/cockroach
compare: grpc-prepare-bump
- 8 commits
- 20 files changed
- 2 contributors
Commits on Dec 4, 2024
-
*: silence deprecation warnings
These will fire after the gRPC bump in the subsequent commits.
Configuration menu - View commit details
-
Copy full SHA for 6a0f64e - Browse repository at this point
Copy the full SHA 6a0f64eView commit details -
Configuration menu - View commit details
-
Copy full SHA for 0b26ead - Browse repository at this point
Copy the full SHA 0b26eadView commit details -
BUILD.bazel: different package path for annotations pkg
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 ```
Configuration menu - View commit details
-
Copy full SHA for 7ae6475 - Browse repository at this point
Copy the full SHA 7ae6475View commit details -
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 ```
Configuration menu - View commit details
-
Copy full SHA for 9393132 - Browse repository at this point
Copy the full SHA 9393132View commit details -
go.mod: go get google.golang.org/genproto@v0.0.0-20230526161137-0005a…
…f68ea54 See googleapis/go-genproto#1015. Sadly grpc-gateway is incompatible with this version of `genproto`: ``` ERROR: no such package '@@org_golang_google_genproto//googleapis/api/httpbody': BUILD file not found in directory 'googleapis/api/httpbody' of external repository @@org_golang_google_genproto. Add a BUILD file to a directory to mark it as a package. ERROR: /private/var/tmp/_bazel_tbg/b1346cddcc70d57afdaa90f7f09f9b2c/external/com_github_grpc_ecosystem_grpc_gateway/runtime/BUILD.bazel:5:11: no such package '@@org_golang_google_genproto//googleapis/api/httpbody': BUILD file not found in directory 'googleapis/api/httpbody' of external repository @@org_golang_google_genproto. Add a BUILD file to a directory to mark it as a package. and referenced by '@@com_github_grpc_ecosystem_grpc_gateway//runtime:go_default_library' ``` Since we are on the final `grpc-gateway/v1` version already[^1], we'll have to make the leap to v2 to fix this. [^1]: https://github.com/grpc-ecosystem/grpc-gateway/releases/tag/v1.16.0
Configuration menu - View commit details
-
Copy full SHA for c4a9e55 - Browse repository at this point
Copy the full SHA c4a9e55View commit details -
build: update patches to be consistent with new version of pkgs
This also adds the bytestream and rpc packages from genproto which are required. Epic: none Release note: None
Configuration menu - View commit details
-
Copy full SHA for 43d8eff - Browse repository at this point
Copy the full SHA 43d8effView commit details -
Configuration menu - View commit details
-
Copy full SHA for 1159327 - Browse repository at this point
Copy the full SHA 1159327View commit details -
DEPS: downgrade gRPC to v1.56.3
This matches the version at the beginning of the PR.
Configuration menu - View commit details
-
Copy full SHA for 5a85d77 - Browse repository at this point
Copy the full SHA 5a85d77View commit details
This comparison is taking too long to generate.
Unfortunately it looks like we can’t render this comparison for you right now. It might be too big, or there might be something weird with your repository.
You can try running this command locally to see the comparison on your machine:
git diff master...grpc-prepare-bump