Skip to content

Commit

Permalink
refactor: use versions rather than bazel_features to avoid circul…
Browse files Browse the repository at this point in the history
…ar load pattern
  • Loading branch information
mattyclarkson committed Feb 25, 2024
1 parent 245eee7 commit 99d37df
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ module(

# The custom repo_name is used to prevent our bazel_features polyfill for WORKSPACE builds from
# conflicting with the real bazel_features repo.
bazel_dep(name = "bazel_features", version = "1.6.0", repo_name = "io_bazel_rules_go_bazel_features")
bazel_dep(name = "bazel_features", version = "1.1.1", repo_name = "io_bazel_rules_go_bazel_features")
bazel_dep(name = "bazel_skylib", version = "1.2.0")
bazel_dep(name = "platforms", version = "0.0.4")
bazel_dep(name = "rules_proto", version = "4.0.0")
Expand Down
3 changes: 1 addition & 2 deletions go/private/sdk.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ load("//go/private:common.bzl", "executable_path")
load("//go/private:nogo.bzl", "go_register_nogo")
load("//go/private/skylib/lib:versions.bzl", "versions")
load("@bazel_tools//tools/build_defs/repo:utils.bzl", "patch", "read_user_netrc", "use_netrc")
load("@io_bazel_rules_go_bazel_features//:features.bzl", "bazel_features")

MIN_SUPPORTED_VERSION = (1, 14, 0)

Expand Down Expand Up @@ -442,7 +441,7 @@ def _remote_sdk(ctx, urls, strip_prefix, sha256):
# in Bazel 6.0.0+ (bazelbuild/bazel#16052). The only situation where
# .zip files are needed seems to be a macOS host using a Windows toolchain
# for remote execution.
if bazel_features.external_deps.extract_supports_unicode_filenames:
if versions.is_at_least("6.4.0", versions.get() or "6.4.0"):
ctx.download_and_extract(
url = urls,
stripPrefix = strip_prefix,
Expand Down

0 comments on commit 99d37df

Please sign in to comment.