-
Notifications
You must be signed in to change notification settings - Fork 312
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add google-cloud-cpp v2.29.0 #2742
Open
mering
wants to merge
1
commit into
bazelbuild:main
Choose a base branch
from
mering:add-google-cloud-cpp
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+148
−0
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| # Copyright 2024 Google LLC | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # https://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
|
|
||
| """Idiomatic C++ client libraries for Google Cloud Platform.""" | ||
|
|
||
| module( | ||
| name = "google_cloud_cpp", | ||
| version = "2.29.0", # Updated by CMake | ||
| compatibility_level = 2, # Updated by CMake | ||
| ) | ||
|
|
||
| bazel_dep(name = "platforms", version = "0.0.10") | ||
| bazel_dep(name = "bazel_skylib", version = "1.7.1") | ||
| bazel_dep(name = "rules_cc", version = "0.0.9") | ||
| bazel_dep(name = "abseil-cpp", version = "20240722.0", repo_name = "com_google_absl") | ||
| bazel_dep(name = "protobuf", version = "26.0.bcr.2", repo_name = "com_google_protobuf") | ||
| bazel_dep(name = "boringssl", version = "0.0.0-20230215-5c22014") | ||
| bazel_dep(name = "grpc", version = "1.66.0", repo_name = "com_github_grpc_grpc") | ||
| bazel_dep(name = "nlohmann_json", version = "3.11.3", repo_name = "com_github_nlohmann_json") | ||
| bazel_dep(name = "curl", version = "8.8.0.bcr.1", repo_name = "com_github_curl_curl") | ||
| bazel_dep(name = "crc32c", version = "1.1.0", repo_name = "com_github_google_crc32c") | ||
| bazel_dep(name = "opentelemetry-cpp", version = "1.16.0", repo_name = "io_opentelemetry_cpp") | ||
|
|
||
| bazel_dep(name = "rules_proto", version = "6.0.2") | ||
| bazel_dep(name = "googletest", version = "1.15.2", repo_name = "com_google_googletest") | ||
| bazel_dep(name = "google_benchmark", version = "1.8.5", repo_name = "com_google_benchmark") | ||
| bazel_dep(name = "yaml-cpp", version = "0.8.0", dev_dependency = True, repo_name = "com_github_jbeder_yaml_cpp") | ||
| bazel_dep(name = "pugixml", version = "1.14.bcr.1", dev_dependency = True, repo_name = "com_github_zeux_pugixml") | ||
|
|
||
| # `google-cloud-cpp` uses this indirectly in the coverage build. And we need | ||
| # to configure it for our CI builds. | ||
| bazel_dep(name = "rules_python", version = "0.35.0", dev_dependency = True) | ||
|
|
||
| python = use_extension("@rules_python//python/extensions:python.bzl", "python", dev_dependency = True) | ||
| python.toolchain( | ||
| ignore_root_user_error = True, | ||
| python_version = "3.11", | ||
| ) | ||
|
|
||
| bazel_dep(name = "googleapis", version = "0.0.0-20240819-fe8ba054a", repo_name = "com_google_googleapis") | ||
|
|
||
| switched_rules = use_extension("@com_google_googleapis//:extensions.bzl", "switched_rules") | ||
| switched_rules.use_languages( | ||
| cc = True, | ||
| grpc = True, | ||
| ) | ||
| use_repo(switched_rules, "com_google_googleapis_imports") | ||
56 changes: 56 additions & 0 deletions
56
modules/google_cloud_cpp/2.29.0/patches/adopt_module_bazel.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| diff --git a/MODULE.bazel b/MODULE.bazel | ||
| index 82524996ae..54595da83a 100644 | ||
| --- a/MODULE.bazel | ||
| +++ b/MODULE.bazel | ||
| @@ -24,7 +24,7 @@ bazel_dep(name = "platforms", version = "0.0.10") | ||
| bazel_dep(name = "bazel_skylib", version = "1.7.1") | ||
| bazel_dep(name = "rules_cc", version = "0.0.9") | ||
| bazel_dep(name = "abseil-cpp", version = "20240722.0", repo_name = "com_google_absl") | ||
| -bazel_dep(name = "protobuf", version = "27.3", repo_name = "com_google_protobuf") | ||
| +bazel_dep(name = "protobuf", version = "26.0.bcr.2", repo_name = "com_google_protobuf") | ||
| bazel_dep(name = "boringssl", version = "0.0.0-20230215-5c22014") | ||
| bazel_dep(name = "grpc", version = "1.66.0", repo_name = "com_github_grpc_grpc") | ||
| bazel_dep(name = "nlohmann_json", version = "3.11.3", repo_name = "com_github_nlohmann_json") | ||
| @@ -32,37 +32,23 @@ bazel_dep(name = "curl", version = "8.8.0.bcr.1", repo_name = "com_github_curl_c | ||
| bazel_dep(name = "crc32c", version = "1.1.0", repo_name = "com_github_google_crc32c") | ||
| bazel_dep(name = "opentelemetry-cpp", version = "1.16.0", repo_name = "io_opentelemetry_cpp") | ||
|
|
||
| -bazel_dep(name = "rules_proto", version = "6.0.2", dev_dependency = True) | ||
| -bazel_dep(name = "googletest", version = "1.15.2", dev_dependency = True, repo_name = "com_google_googletest") | ||
| -bazel_dep(name = "google_benchmark", version = "1.8.5", dev_dependency = True, repo_name = "com_google_benchmark") | ||
| +bazel_dep(name = "rules_proto", version = "6.0.2") | ||
| +bazel_dep(name = "googletest", version = "1.15.2", repo_name = "com_google_googletest") | ||
| +bazel_dep(name = "google_benchmark", version = "1.8.5", repo_name = "com_google_benchmark") | ||
| bazel_dep(name = "yaml-cpp", version = "0.8.0", dev_dependency = True, repo_name = "com_github_jbeder_yaml_cpp") | ||
| bazel_dep(name = "pugixml", version = "1.14.bcr.1", dev_dependency = True, repo_name = "com_github_zeux_pugixml") | ||
|
|
||
| -# Our `curl.BUILD` file uses these. | ||
| -bazel_dep(name = "zlib", version = "1.3.1.bcr.3") | ||
| -bazel_dep(name = "c-ares", version = "1.16.1", repo_name = "com_github_cares_cares") | ||
| - | ||
| # `google-cloud-cpp` uses this indirectly in the coverage build. And we need | ||
| # to configure it for our CI builds. | ||
| bazel_dep(name = "rules_python", version = "0.35.0", dev_dependency = True) | ||
|
|
||
| -python = use_extension("@rules_python//python/extensions:python.bzl", "python") | ||
| +python = use_extension("@rules_python//python/extensions:python.bzl", "python", dev_dependency = True) | ||
| python.toolchain( | ||
| ignore_root_user_error = True, | ||
| python_version = "3.11", | ||
| ) | ||
|
|
||
| -bazel_dep(name = "googleapis", version = "0.0.0", repo_name = "com_google_googleapis") | ||
| -archive_override( | ||
| - module_name = "googleapis", | ||
| - integrity = "sha256-Q1rmFacasnGNXks0iyRC2JagP5weqYGC3C6pJ/ODrNI=", | ||
| - patch_strip = 1, | ||
| - patches = ["//bazel:googleapis.modules.patch"], | ||
| - strip_prefix = "googleapis-6a474b31c53cc1797710206824a17b364a835d2d", | ||
| - urls = [ | ||
| - "https://github.com/googleapis/googleapis/archive/6a474b31c53cc1797710206824a17b364a835d2d.tar.gz", | ||
| - ], | ||
| -) | ||
| +bazel_dep(name = "googleapis", version = "0.0.0-20240819-fe8ba054a", repo_name = "com_google_googleapis") | ||
|
|
||
| switched_rules = use_extension("@com_google_googleapis//:extensions.bzl", "switched_rules") | ||
| switched_rules.use_languages( |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| matrix: | ||
| platform: ["debian10", "macos", "ubuntu2004", "windows"] | ||
| bazel: ["7.x"] | ||
| tasks: | ||
| verify_targets: | ||
| platform: ${{ platform }} | ||
| bazel: ${{ bazel }} | ||
| build_targets: | ||
| - '@google_cloud_cpp//google/cloud/...' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| { | ||
| "integrity": "sha256-dY4eyoGGuWJRbAZZs0zhdouhyXac/ZmMW7/7CErZAf8=", | ||
| "strip_prefix": "google-cloud-cpp-2.29.0", | ||
| "url": "https://github.com/googleapis/google-cloud-cpp/archive/refs/tags/v2.29.0.tar.gz", | ||
| "patch_strip": 1, | ||
| "patches": { | ||
| "adopt_module_bazel.patch": "sha256-sJGk7i4N8/qeZbegENJGP0TwAp+Bur5FEMoml/xdNE0=" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| { | ||
| "homepage": "https://github.com/googleapis/google-cloud-cpp", | ||
| "maintainers": [ | ||
| { | ||
| "email": "[email protected]", | ||
| "name": "No Maintainer Specified" | ||
| } | ||
| ], | ||
| "repository": [ | ||
| "github:googleapis/google-cloud-cpp" | ||
| ], | ||
| "versions": [ | ||
| "2.29.0" | ||
| ], | ||
| "yanked_versions": {} | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why don’t you keep it named google-cloud-cpp ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I thought dashes sometimes lead to problems. If this is not the case, I can rename it of course.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I’m not aware of this kind of issue. Have you seen it with bzlmod or only with workspace ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it was Python pip packages replacing dashes with underscores for some reason. But this might be related to Python importpath or similar.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actually I noticed it has been chosen like this from upstream already. So I didn't change it in a patch. Would it be preferable to change it with a patch for the initial upload?