From cb6e3b72a876f4250fc6946e0e8f73b8fa8b7b92 Mon Sep 17 00:00:00 2001 From: Tim Van Baak Date: Fri, 2 May 2025 15:00:19 -0700 Subject: [PATCH] Enable setting rev via -ldflags --- core/info.go | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/core/info.go b/core/info.go index f9c8be5..08331e3 100644 --- a/core/info.go +++ b/core/info.go @@ -2,15 +2,21 @@ package core import "runtime/debug" +// Set via -ldflags "-X github.com/Jaculabilis/intake/core.Commit=..." +var Commit string = "" + func GetRevInfo() (rev string) { - rev = "" - if info, ok := debug.ReadBuildInfo(); ok { - for _, setting := range info.Settings { - if setting.Key == "vcs.revision" { - rev = setting.Value + rev - } - if setting.Key == "vcs.modified" && setting.Value == "true" { - rev = rev + "-dirty" + rev = Commit + if rev == "" { + // No build data embedded, try from runtime/debug + if info, ok := debug.ReadBuildInfo(); ok { + for _, setting := range info.Settings { + if setting.Key == "vcs.revision" { + rev = setting.Value + rev + } + if setting.Key == "vcs.modified" && setting.Value == "true" { + rev = rev + "-dirty" + } } } }