Skip to content

version: use git hash instead of file blob hash for Version.Build #3987

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
derekparker merged 1 commit into from
Apr 22, 2025
Merged

version: use git hash instead of file blob hash for Version.Build #3987

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 22 additions & 5 deletions pkg/version/fixbuild.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,38 @@

package version

import "runtime/debug"
import (
"runtime/debug"
"strings"
)

func init() {
fixBuild = buildInfoFixBuild
}

func buildInfoFixBuild(v *Version) {
// Return if v.Build already set, but not if it is Git ident expand file blob hash
if !strings.HasPrefix(v.Build, "$Id: ") && !strings.HasSuffix(v.Build, " $") {
Copy link
Contributor Author

@codeaucafe codeaucafe Apr 17, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

technically don't need this IF the $Id$ is removed but I think its best to keep as fallback/backwards compatibility

return
}

info, ok := debug.ReadBuildInfo()
if !ok {
return
}
for i := range info.Settings {
if info.Settings[i].Key == "gitrevision" {
v.Build = info.Settings[i].Value
break

for _, setting := range info.Settings {
if setting.Key == "vcs.revision" {
v.Build = setting.Value
return
}
}

// If we didn't find vcs.revision, try the old key for backward compatibility
Copy link
Contributor Author

@codeaucafe codeaucafe Apr 15, 2025

Choose a reason for hiding this comment

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

leaving as backwards compatibility fall back

for _, setting := range info.Settings {
if setting.Key == "gitrevision" {
v.Build = setting.Value
return
}
}
}