From b0758fd1097191313fc62a95cb61edff994707ee Mon Sep 17 00:00:00 2001 From: Paolo Tranquilli Date: Mon, 29 Apr 2024 10:29:53 +0200 Subject: [PATCH] Go: workaround for gazelle on macOS See https://github.com/bazelbuild/bazel-gazelle/issues/1793 for details. --- MODULE.bazel | 6 +++++- go/BUILD.bazel | 13 +++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/MODULE.bazel b/MODULE.bazel index 6daa5a98215b..5fd99f767404 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -56,7 +56,11 @@ node.toolchain( use_repo(node, "nodejs", "nodejs_toolchains") go_sdk = use_extension("@rules_go//go:extensions.bzl", "go_sdk") -go_sdk.download(version = "1.22.2") +go_sdk.download(version = "1.22.2") # default + +# following is needed for gazelle on macOS +# see https://github.com/bazelbuild/bazel-gazelle/issues/1793 +go_sdk.download(version = "1.21.9") register_toolchains( "@nodejs_toolchains//:all", diff --git a/go/BUILD.bazel b/go/BUILD.bazel index 50e2bc0d447d..41113d45f518 100644 --- a/go/BUILD.bazel +++ b/go/BUILD.bazel @@ -1,12 +1,25 @@ load("@bazel_skylib//rules:native_binary.bzl", "native_binary") load("@gazelle//:def.bzl", "gazelle") +load("@rules_go//go:def.bzl", "go_cross_binary") load("@rules_pkg//pkg:install.bzl", "pkg_install") load("@rules_pkg//pkg:mappings.bzl", "pkg_attributes", "pkg_filegroup", "pkg_files") load("//:defs.bzl", "codeql_platform") +# following is needed for running gazelle on macOS +# see https://github.com/bazelbuild/bazel-gazelle/issues/1793 +go_cross_binary( + name = "gazelle-1.21.9", + sdk_version = "1.21.9", + target = "@gazelle//cmd/gazelle", +) + gazelle( name = "gazelle", extra_args = ["go/extractor"], + gazelle = select({ + "@platforms//os:macos": ":gazelle-1.21.9", + "//conditions:default": "@gazelle//cmd/gazelle", + }), ) _gen_binaries = [