From 29e50395eb4e34ef9793d264c70a3ea72d3f81e1 Mon Sep 17 00:00:00 2001 From: Matthieu MOREL Date: Mon, 17 Jun 2024 23:48:40 +0200 Subject: [PATCH 1/3] use module version of googleapis --- .github/workflows/testing.yml | 3 +++ MODULE.bazel | 8 +------- bazel/BUILD.bazel | 0 bazel/http_archives_extension.bzl | 13 ------------- bazel/switched_rules_extension.bzl | 8 -------- 5 files changed, 4 insertions(+), 28 deletions(-) delete mode 100644 bazel/BUILD.bazel delete mode 100644 bazel/http_archives_extension.bzl delete mode 100644 bazel/switched_rules_extension.bzl diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 1116bc933..d84285750 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -16,6 +16,9 @@ jobs: matrix: bazel_version: ["6.0.0", "7.0.0"] bzlmod: ["--noenable_bzlmod", "--enable_bzlmod"] + exclude: + - bazel_version: "6.0.0" + bzlmod: "--enable_bzlmod" steps: - name: Checkout repo uses: actions/checkout@v2 diff --git a/MODULE.bazel b/MODULE.bazel index 86173c880..bf7beba8f 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -4,12 +4,6 @@ module( repo_name = "io_grpc_grpc_proto", ) +bazel_dep(name = "googleapis", version = "0.0.0-20240326-1c8d509c5", repo_name = "com_google_googleapis") bazel_dep(name = "rules_proto", version = "4.0.0") bazel_dep(name = "protobuf", version = "23.1", repo_name = "com_google_protobuf") -# -- bazel_dep definitions -- # - -http_archives_extension = use_extension("//bazel:http_archives_extension.bzl", "http_archives_extension") -use_repo(http_archives_extension, "com_google_googleapis") - -switched_rules_extension = use_extension("//bazel:switched_rules_extension.bzl", "switched_rules_extension") -use_repo(switched_rules_extension, "com_google_googleapis_imports") diff --git a/bazel/BUILD.bazel b/bazel/BUILD.bazel deleted file mode 100644 index e69de29bb..000000000 diff --git a/bazel/http_archives_extension.bzl b/bazel/http_archives_extension.bzl deleted file mode 100644 index 79e67a6d9..000000000 --- a/bazel/http_archives_extension.bzl +++ /dev/null @@ -1,13 +0,0 @@ -load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") - -def _http_archives_extension_impl(ctx): - http_archive( - name = "com_google_googleapis", - urls = [ - "https://github.com/googleapis/googleapis/archive/052b274138fce2be80f97b6dcb83ab343c7c8812.tar.gz", - ], - sha256 = "e31dc9f889bf53e001998d16385881b507c8cc1455bbe5618b16f0f8cb0fd46f", - strip_prefix = "googleapis-052b274138fce2be80f97b6dcb83ab343c7c8812", - ) - -http_archives_extension = module_extension(implementation = _http_archives_extension_impl) diff --git a/bazel/switched_rules_extension.bzl b/bazel/switched_rules_extension.bzl deleted file mode 100644 index 9499f4f44..000000000 --- a/bazel/switched_rules_extension.bzl +++ /dev/null @@ -1,8 +0,0 @@ -load("@com_google_googleapis//:repository_rules.bzl", "switched_rules_by_language") - -def _switched_rules_extension_impl(ctx): - switched_rules_by_language( - name = "com_google_googleapis_imports", - ) - -switched_rules_extension = module_extension(implementation = _switched_rules_extension_impl) From 4c4069720545916d8b9241d92f05e1d824fecd35 Mon Sep 17 00:00:00 2001 From: Matthieu MOREL Date: Thu, 20 Jun 2024 07:34:42 +0200 Subject: [PATCH 2/3] Update MODULE.bazel --- MODULE.bazel | 1 + 1 file changed, 1 insertion(+) diff --git a/MODULE.bazel b/MODULE.bazel index bf7beba8f..a7aadc6e4 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -1,6 +1,7 @@ module( name = "grpc-proto", version = "0.0.0", + bazel_compatibility = [">=7.0.0"], repo_name = "io_grpc_grpc_proto", ) From 1acdeb4d0c4e3469871b9caa14d4fb979a67866f Mon Sep 17 00:00:00 2001 From: Matthieu MOREL Date: Thu, 20 Jun 2024 21:54:08 +0200 Subject: [PATCH 3/3] Update MODULE.bazel --- MODULE.bazel | 1 - 1 file changed, 1 deletion(-) diff --git a/MODULE.bazel b/MODULE.bazel index a7aadc6e4..bf7beba8f 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -1,7 +1,6 @@ module( name = "grpc-proto", version = "0.0.0", - bazel_compatibility = [">=7.0.0"], repo_name = "io_grpc_grpc_proto", )