Skip to content

Commit

Permalink
Address review comments
Browse files Browse the repository at this point in the history
  • Loading branch information
fmeum committed Mar 8, 2023
1 parent bdb3444 commit 0df694a
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 8 deletions.
6 changes: 6 additions & 0 deletions go/private/extensions.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,12 @@ def _default_go_sdk_name(*, module, multi_version, tag_type, index):
)

def _toolchain_prefix(index, name):
"""Prefixes the given name with the index, padded with zeros to ensure lexicographic sorting.
Examples:
_toolchain_prefix( 2, "foo") == "_0002_foo_"
_toolchain_prefix(2000, "foo") == "_2000_foo_"
"""
return "_{}_{}_".format(_left_pad_zero(index, _TOOLCHAIN_INDEX_PAD_LENGTH), name)

def _left_pad_zero(index, length):
Expand Down
14 changes: 6 additions & 8 deletions go/private/sdk.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -228,14 +228,7 @@ def go_toolchains_build_file_content(
sdk_repos,
sdk_types,
sdk_versions):
if len({len(l): None for l in [
prefixes,
geese,
goarchs,
sdk_repos,
sdk_types,
sdk_versions,
]}) != 1:
if not _have_same_length(prefixes, geese, goarchs, sdk_repos, sdk_types, sdk_versions):
fail("all lists must have the same length")

loads = [
Expand Down Expand Up @@ -622,6 +615,11 @@ def _version_string(v):
v = v[:-1]
return ".".join([str(n) for n in v]) + suffix

def _have_same_length(*lists):
if not lists:
fail("expected at least one list")
return len({len(l): None for l in lists}) == 1

def go_register_toolchains(version = None, nogo = None, go_version = None, experiments = None):
"""See /go/toolchains.rst#go-register-toolchains for full documentation."""
if not version:
Expand Down

0 comments on commit 0df694a

Please sign in to comment.