Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix bzlmod #600

Merged
merged 2 commits into from
Oct 8, 2023
Merged

Fix bzlmod #600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
89054df
fix: gazelle is not a devdep
alexeagle Oct 8, 2023
8d540ce
fix: gazelle must be a regular dep
alexeagle Oct 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 22 additions & 11 deletions .bcr/patches/go_dev_dep.patch
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,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 @@ -44,4 +59,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)