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

Go: Better handle pre-release versions #15327

Merged
merged 3 commits into from
Jan 15, 2024
+9 −1
Merged

Go: Better handle pre-release versions #15327

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
42dcb5f
Go: Better handle pre-release versions
mbg Jan 15, 2024
a64c001
Go: Remove unnecessary call to Canonical
mbg Jan 15, 2024
8c13429
Go: Ensure `getEnvGoSemVer` returns a canonical SemVer
mbg Jan 15, 2024
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
13 changes: 11 additions & 2 deletions go/extractor/cli/go-autobuilder/go-autobuilder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,15 @@ func getEnvGoSemVer() string {
if !strings.HasPrefix(goVersion, "go") {
log.Fatalf("Expected 'go version' output of the form 'go1.2.3'; got '%s'", goVersion)
}
return "v" + goVersion[2:]
// Go versions don't follow the SemVer format, but the only exception we normally care about
// is release candidates; so this is a horrible hack to convert e.g. `go1.22rc1` into `go1.22-rc1`
// which is compatible with the SemVer specification
rcIndex := strings.Index(goVersion, "rc")
if rcIndex != -1 {
return semver.Canonical("v"+goVersion[2:rcIndex]) + "-" + goVersion[rcIndex:]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I find it confusing that we call semver.Canonical here and also on line 798 (but not at other call-sites). Is that intentional?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think L798 is leftover from the first attempt at getting this to work and is no longer necessary, so can be removed.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That makes sense. Would there be any benefit in also using semver.Canonical on the other branch, so that we know we're always returning a canonical version?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

} else {
return "v" + goVersion[2:]
}
}

// Returns the import path of the package being built, or "" if it cannot be determined.
Expand Down Expand Up @@ -787,10 +795,11 @@ func installDependenciesAndBuild() {
}

goVersionInfo := tryReadGoDirective(buildInfo)
canonEnvSemVer := semver.Canonical(getEnvGoSemVer())

// This diagnostic is not required if the system Go version is 1.21 or greater, since the
// Go tooling should install required Go versions as needed.
if semver.Compare(getEnvGoSemVer(), "v1.21.0") < 0 && goVersionInfo.Found && semver.Compare("v"+goVersionInfo.Version, getEnvGoSemVer()) > 0 {
if semver.Compare(canonEnvSemVer, "v1.21.0") < 0 && goVersionInfo.Found && semver.Compare("v"+goVersionInfo.Version, canonEnvSemVer) > 0 {
diagnostics.EmitNewerGoVersionNeeded()
}

Expand Down
Loading