Skip to content

Commit 88fd873

Browse files
committed
fix: bzlmod on bazel 6
1 parent fbb77a4 commit 88fd873

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

MODULE.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ module(
1010
# Lower-bound dependency versions.
1111
# These should NOT be increased unless needed, as bumping our lower-bound may change
1212
# the versions resolved in users repositories.
13+
bazel_dep(name = "bazel_features", version = "1.9.0")
1314
bazel_dep(name = "bazel_skylib", version = "1.3.0")
1415
bazel_dep(name = "platforms", version = "0.0.5")
1516
bazel_dep(name = "rules_cc", version = "0.0.9")

ruby/extensions.bzl

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
"Module extensions used by bzlmod"
22

3+
load("@bazel_features//:features.bzl", "bazel_features")
34
load("//ruby/private:download.bzl", "RUBY_BUILD_VERSION")
45
load("//ruby/private:toolchain.bzl", "DEFAULT_RUBY_REPOSITORY")
56
load(":deps.bzl", "rb_bundle", "rb_bundle_fetch", "rb_register_toolchains")
@@ -105,11 +106,17 @@ def _ruby_module_extension(module_ctx):
105106
register = False,
106107
)
107108

108-
return module_ctx.extension_metadata(
109-
reproducible = True,
110-
root_module_direct_deps = direct_dep_names,
111-
root_module_direct_dev_deps = direct_dev_dep_names,
112-
)
109+
if bazel_features.external_deps.extension_metadata_has_reproducible:
110+
return module_ctx.extension_metadata(
111+
reproducible = True,
112+
root_module_direct_deps = direct_dep_names,
113+
root_module_direct_dev_deps = direct_dev_dep_names,
114+
)
115+
else:
116+
return module_ctx.extension_metadata(
117+
root_module_direct_deps = direct_dep_names,
118+
root_module_direct_dev_deps = direct_dev_dep_names,
119+
)
113120

114121
ruby = module_extension(
115122
implementation = _ruby_module_extension,

0 commit comments

Comments
 (0)