From b800947836293b03701f2ad63dd0fc0a62f93dc9 Mon Sep 17 00:00:00 2001 From: Richard Lavoie Date: Tue, 28 Jan 2025 12:06:29 -0500 Subject: [PATCH] apply patch through wrapper macro --- third_party/go/deps.bzl | 3 --- third_party/go/go_repository.bzl | 7 +++++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/third_party/go/deps.bzl b/third_party/go/deps.bzl index 230efd11..f7ea54a4 100644 --- a/third_party/go/deps.bzl +++ b/third_party/go/deps.bzl @@ -28,9 +28,6 @@ def go_dependencies(): go_repository( name = "com_github_bazelbuild_bazel_gazelle", importpath = "github.com/bazelbuild/bazel-gazelle", - patches = [ - "//third_party/patches:gazelle_regexp.patch", - ], sum = "h1:SAYys3KRG5i3KTgQAvO423bLT1rQMSgqEKReMkM/CW0=", version = "v0.40.0", ) diff --git a/third_party/go/go_repository.bzl b/third_party/go/go_repository.bzl index a4bd6485..41203f3a 100644 --- a/third_party/go/go_repository.bzl +++ b/third_party/go/go_repository.bzl @@ -6,4 +6,11 @@ def go_repository(**kwargs): # Work around https://github.com/bazelbuild/bazel-gazelle/issues/1344 kwargs["build_external"] = "external" + + # Work around for https://github.com/bazel-contrib/bazel-gazelle/pull/2021 until new release of bazel-gazelle + if kwargs["importpath"] == "github.com/bazelbuild/bazel-gazelle": + kwargs["patches"] = [ + "//third_party/patches:gazelle_regexp.patch", + ] + _go_repository(**kwargs)