Skip to content

detect_sdk_version: Support 1.21's new VERSION file format #3600

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

Merged
merged 2 commits into from
Jun 22, 2023
Merged

detect_sdk_version: Support 1.21's new VERSION file format #3600

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c249d4
detect_sdk_version: Support 1.21's new VERSION file format
evanj Jun 22, 2023
6624faa
clarify the string manipulation operation
evanj Jun 22, 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
3 changes: 2 additions & 1 deletion go/private/sdk.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -545,7 +545,8 @@ def _detect_sdk_version(ctx, goroot):
version_file_path = goroot + "/VERSION"
if ctx.path(version_file_path).exists:
# VERSION file has version prefixed by go, eg. go1.18.3
version = ctx.read(version_file_path)[2:]
# 1.21: The version is the first line
version = ctx.read(version_file_path)[2:].splitlines()[0]
if ctx.attr.version and ctx.attr.version != version:
fail("SDK is version %s, but version %s was expected" % (version, ctx.attr.version))
return version
Expand Down