Skip to content

Commit

Permalink
Fix bzlmod (#600)
Browse files Browse the repository at this point in the history
* fix: gazelle is not a devdep

It's easy to see because we reference the symbol two lines below here

* fix: gazelle must be a regular dep

I found this mistake when trying to use bazel-lib in a downstream repo.
  • Loading branch information
alexeagle committed Dec 23, 2023
1 parent 4b465cd commit e7487a7
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 14 deletions.
33 changes: 22 additions & 11 deletions .bcr/patches/go_dev_dep.patch
Original file line number Diff line number Diff line change
@@ -1,16 +1,27 @@
diff --git a/MODULE.bazel b/MODULE.bazel
index f05c57a..4cb6104 100644
index 07a6eff..26702ad 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -28,9 +28,9 @@ register_toolchains(
# To allow /tools to be built from source
# NOTE: when publishing to BCR, we patch this to be dev_dependency, as we publish pre-built binaries
# along with our releases.
-bazel_dep(name = "rules_go", version = "0.41.0", repo_name = "io_bazel_rules_go")
+bazel_dep(name = "rules_go", version = "0.41.0", repo_name = "io_bazel_rules_go", dev_dependency = True)

-go_deps = use_extension("@gazelle//:extensions.bzl", "go_deps")
+go_deps = use_extension("@gazelle//:extensions.bzl", "go_deps", dev_dependency = True)
@@ -34,19 +34,19 @@ register_toolchains(
bazel_dep(
name = "gazelle",
version = "0.33.0",
- # In released versions: dev_dependency = True
+ dev_dependency = True
)
bazel_dep(
name = "rules_go",
version = "0.41.0",
repo_name = "io_bazel_rules_go",
- # In released versions: dev_dependency = True
+ dev_dependency = True
)

go_deps = use_extension(
"@gazelle//:extensions.bzl",
"go_deps",
- # In released versions: dev_dependency = True
+ dev_dependency = True
)
go_deps.from_file(go_mod = "//:go.mod")
use_repo(
go_deps,
20 changes: 17 additions & 3 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,24 @@ register_toolchains(
# To allow /tools to be built from source
# NOTE: when publishing to BCR, we patch this to be dev_dependency, as we publish pre-built binaries
# along with our releases.
bazel_dep(name = "rules_go", version = "0.41.0", repo_name = "io_bazel_rules_go")

go_deps = use_extension("@gazelle//:extensions.bzl", "go_deps")
bazel_dep(
name = "gazelle",
version = "0.33.0",
# In released versions: dev_dependency = True
)
bazel_dep(
name = "rules_go",
version = "0.41.0",
repo_name = "io_bazel_rules_go",
# In released versions: dev_dependency = True
)

go_deps = use_extension(
"@gazelle//:extensions.bzl",
"go_deps",
# In released versions: dev_dependency = True
)
go_deps.from_file(go_mod = "//:go.mod")
use_repo(
go_deps,
Expand All @@ -49,4 +64,3 @@ use_repo(

bazel_dep(name = "bazel_skylib_gazelle_plugin", version = "1.4.1", dev_dependency = True)
bazel_dep(name = "buildifier_prebuilt", version = "6.3.3", dev_dependency = True)
bazel_dep(name = "gazelle", version = "0.33.0", dev_dependency = True)

0 comments on commit e7487a7

Please sign in to comment.