From 9161d5afa6e8e956948e698e1b87ac33a69200dd Mon Sep 17 00:00:00 2001 From: Fabian Meumertzheim Date: Sat, 21 Dec 2024 15:43:44 +0100 Subject: [PATCH] Drop googleapis-grpc-cc --- modules/googleapis-grpc-cc/0.1.0/MODULE.bazel | 14 -------------- .../0.1.0/overlay/MODULE.bazel | 1 - modules/googleapis-grpc-cc/0.1.0/presubmit.yml | 9 --------- modules/googleapis-grpc-cc/0.1.0/source.json | 7 ------- modules/googleapis-grpc-cc/metadata.json | 16 ---------------- .../overlay/private/extensions/constants.bzl | 2 +- .../overlay/tests/bcr/BUILD.bazel | 5 ----- .../overlay/tests/bcr/MODULE.bazel | 1 - .../0.0.0-20241220-5e258e33/source.json | 6 +++--- 9 files changed, 4 insertions(+), 57 deletions(-) delete mode 100644 modules/googleapis-grpc-cc/0.1.0/MODULE.bazel delete mode 120000 modules/googleapis-grpc-cc/0.1.0/overlay/MODULE.bazel delete mode 100644 modules/googleapis-grpc-cc/0.1.0/presubmit.yml delete mode 100644 modules/googleapis-grpc-cc/0.1.0/source.json delete mode 100644 modules/googleapis-grpc-cc/metadata.json diff --git a/modules/googleapis-grpc-cc/0.1.0/MODULE.bazel b/modules/googleapis-grpc-cc/0.1.0/MODULE.bazel deleted file mode 100644 index 843ebe94398..00000000000 --- a/modules/googleapis-grpc-cc/0.1.0/MODULE.bazel +++ /dev/null @@ -1,14 +0,0 @@ -module( - name = "googleapis-grpc-cc", - version = "0.1.0", - bazel_compatibility = [">=7.2.1"], -) - -bazel_dep(name = "googleapis", version = "0.0.0-20241220-5e258e33") -bazel_dep(name = "grpc", version = "1.66.0.bcr.2") - -switched_rules = use_extension("@googleapis//private/extensions:switched_rules.bzl", "switched_rules") -switched_rules.register( - name = "cc_grpc_library", - file = "@grpc//bazel:cc_grpc_library.bzl", -) diff --git a/modules/googleapis-grpc-cc/0.1.0/overlay/MODULE.bazel b/modules/googleapis-grpc-cc/0.1.0/overlay/MODULE.bazel deleted file mode 120000 index 9b599e3ad9c..00000000000 --- a/modules/googleapis-grpc-cc/0.1.0/overlay/MODULE.bazel +++ /dev/null @@ -1 +0,0 @@ -../MODULE.bazel \ No newline at end of file diff --git a/modules/googleapis-grpc-cc/0.1.0/presubmit.yml b/modules/googleapis-grpc-cc/0.1.0/presubmit.yml deleted file mode 100644 index fd9c465d89e..00000000000 --- a/modules/googleapis-grpc-cc/0.1.0/presubmit.yml +++ /dev/null @@ -1,9 +0,0 @@ -tasks: - verify_targets: - name: Empty test - platform: ubuntu2404 - bazel: 8.x - build_flags: - - "--nobuild" - build_targets: - - "//..." diff --git a/modules/googleapis-grpc-cc/0.1.0/source.json b/modules/googleapis-grpc-cc/0.1.0/source.json deleted file mode 100644 index 2434195e9a9..00000000000 --- a/modules/googleapis-grpc-cc/0.1.0/source.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "integrity": "sha256-hznHbmgfkAkjuQDJ3w73XPQh05yrtUZQxLmtGbanbYU=", - "url": "https://github.com/fmeum/bazel-central-registry/releases/download/v1.0.0/empty.zip", - "overlay": { - "MODULE.bazel": "sha256-+6YcOMfETtd1CUAzcxFHtQvJtllgUrx5kWElgP6gYOs=" - } -} diff --git a/modules/googleapis-grpc-cc/metadata.json b/modules/googleapis-grpc-cc/metadata.json deleted file mode 100644 index ed2c966d2e4..00000000000 --- a/modules/googleapis-grpc-cc/metadata.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "homepage": "https://github.com/googleapis/googleapis", - "maintainers": [ - { - "email": "bcr-maintainers@bazel.build", - "name": "No Maintainer Specified" - } - ], - "repository": [ - "github:googleapis/googleapis" - ], - "versions": [ - "0.1.0" - ], - "yanked_versions": {} -} diff --git a/modules/googleapis/0.0.0-20241220-5e258e33/overlay/private/extensions/constants.bzl b/modules/googleapis/0.0.0-20241220-5e258e33/overlay/private/extensions/constants.bzl index ebdbcd9f33b..ab36f3009bc 100644 --- a/modules/googleapis/0.0.0-20241220-5e258e33/overlay/private/extensions/constants.bzl +++ b/modules/googleapis/0.0.0-20241220-5e258e33/overlay/private/extensions/constants.bzl @@ -2,7 +2,7 @@ # module or to None if the rule is not supported yet. RULE_TO_FLAVOR = { "cc_gapic_library": None, - "cc_grpc_library": "grpc-cc", + "cc_grpc_library": None, "cc_proto_library": "cc", "csharp_gapic_assembly_pkg": None, "csharp_gapic_library": None, diff --git a/modules/googleapis/0.0.0-20241220-5e258e33/overlay/tests/bcr/BUILD.bazel b/modules/googleapis/0.0.0-20241220-5e258e33/overlay/tests/bcr/BUILD.bazel index 89154afab3d..09ff5f8c34e 100644 --- a/modules/googleapis/0.0.0-20241220-5e258e33/overlay/tests/bcr/BUILD.bazel +++ b/modules/googleapis/0.0.0-20241220-5e258e33/overlay/tests/bcr/BUILD.bazel @@ -20,11 +20,6 @@ alias( actual = "@googleapis//google/type:date_py_proto", ) -alias( - name = "spanner_cc_grpc", - actual = "@googleapis//google/spanner/v1:spanner_cc_grpc", -) - alias( name = "spanner_java_grpc", actual = "@googleapis//google/spanner/v1:spanner_java_grpc", diff --git a/modules/googleapis/0.0.0-20241220-5e258e33/overlay/tests/bcr/MODULE.bazel b/modules/googleapis/0.0.0-20241220-5e258e33/overlay/tests/bcr/MODULE.bazel index f4b2509fd25..dc220ff798b 100644 --- a/modules/googleapis/0.0.0-20241220-5e258e33/overlay/tests/bcr/MODULE.bazel +++ b/modules/googleapis/0.0.0-20241220-5e258e33/overlay/tests/bcr/MODULE.bazel @@ -3,7 +3,6 @@ bazel_dep(name = "googleapis") bazel_dep(name = "googleapis-go", version = "0.1.0") bazel_dep(name = "googleapis-java", version = "0.1.0") bazel_dep(name = "googleapis-python", version = "0.1.0") -bazel_dep(name = "googleapis-grpc-cc", version = "0.1.0") bazel_dep(name = "googleapis-grpc-java", version = "0.1.0") # Intentionally missing a dependency on googleapis-cc to test that it doesn't result in an error. diff --git a/modules/googleapis/0.0.0-20241220-5e258e33/source.json b/modules/googleapis/0.0.0-20241220-5e258e33/source.json index 63556ca21d8..77f207a62ca 100644 --- a/modules/googleapis/0.0.0-20241220-5e258e33/source.json +++ b/modules/googleapis/0.0.0-20241220-5e258e33/source.json @@ -6,12 +6,12 @@ "MODULE.bazel": "sha256-MlXxZ/4UxwoscsQihmhKKGw1Cb6P0wAVqvQG56+1n1w=", "extensions.bzl": "sha256-jj4EKrYrYsALa4wi11LYl7yULEWhIDr3HyKNnL6LFUE=", "private/extensions/BUILD.bazel": "sha256-47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=", - "private/extensions/constants.bzl": "sha256-Lr2u+OnTl5Y+9HUTLM4CQai8ohnBf9AoVAOv5JERgZs=", + "private/extensions/constants.bzl": "sha256-CtBb2ekQdEatYN0pd6l0Aakn8zRN6Ty2CAgzohNx4KI=", "private/extensions/fail_macro.bzl": "sha256-Ux6k9i7qKn7Y0gT1LFnHZiTGuPid7m1p3PncsnK8/iU=", "private/extensions/switched_rules.bzl": "sha256-LkAQ/CEVSLYhHb0k1Ym4uBRC0yf6NQugxPZjPZteXMg=", "tests/bcr/.bazelrc": "sha256-hFZT+gits3VtXcUkKuh3NCEC9FgBNGuNxaOVCuOiFPk=", - "tests/bcr/BUILD.bazel": "sha256-SyxDBwLmV0c2ssGUSaHawNu8IDOXSGL/YaWsI4pnSbk=", - "tests/bcr/MODULE.bazel": "sha256-mBed9uTWcQM8aMMq9vOzprfoj6kmef5xj/Xl7PiDE6M=", + "tests/bcr/BUILD.bazel": "sha256-V70eP/KkZPjN+Zu//fkuZmvg0IhUvzSMR2Iis3whacc=", + "tests/bcr/MODULE.bazel": "sha256-4s8xj9npqDzhJXi6BfQYDLhDoXwZ9cdFD4khXRvqWzs=", "tests/bcr/failure_test.bzl": "sha256-QV38fwhaAPQStLQr06YGR1NDE/lsgnTs4cDjR/oDpl8=" } }