TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2024-11-25 19:15:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

version: add GitCommitTime to Meta

Browse Source 
Updates tailscale/corp#1297

Signed-off-by: Maisem Ali <maisem@tailscale.com>
This commit is contained in:
Maisem Ali 2024-05-16 10:31:44 -04:00 committed by Maisem Ali
parent 359ef61263
commit 8feb4ff5d2
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
version/prop.go
View File

@ -230,6 +230,9 @@ type Meta struct {
// daemon, if requested. // daemon, if requested.
DaemonLong string `json:"daemonLong,omitempty"` DaemonLong string `json:"daemonLong,omitempty"`
// GitCommitTime is the commit time of the git commit in GitCommit.
GitCommitTime string `json:"gitCommitTime,omitempty"`
// Cap is the current Tailscale capability version. It's a monotonically // Cap is the current Tailscale capability version. It's a monotonically
// incrementing integer that's incremented whenever a new capability is // incrementing integer that's incremented whenever a new capability is
// added. // added.
@ -245,6 +248,7 @@ func GetMeta() Meta {
MajorMinorPatch: majorMinorPatch(), MajorMinorPatch: majorMinorPatch(),
Short: Short(), Short: Short(),
Long: Long(), Long: Long(),
GitCommitTime: getEmbeddedInfo().commitTime,
GitCommit: gitCommit(), GitCommit: gitCommit(),
GitDirty: gitDirty(), GitDirty: gitDirty(),
ExtraGitCommit: extraGitCommitStamp, ExtraGitCommit: extraGitCommitStamp,

2
version/version.go
View File

@ -105,6 +105,7 @@ type embeddedInfo struct {
valid bool valid bool
commit string commit string
commitDate string commitDate string
commitTime string
dirty bool dirty bool
} }
@ -126,6 +127,7 @@ func (i embeddedInfo) commitAbbrev() string {
case "vcs.revision": case "vcs.revision":
ret.commit = s.Value ret.commit = s.Value
case "vcs.time": case "vcs.time":
ret.commitTime = s.Value
if len(s.Value) >= len("yyyy-mm-dd") { if len(s.Value) >= len("yyyy-mm-dd") {
ret.commitDate = s.Value[:len("yyyy-mm-dd")] ret.commitDate = s.Value[:len("yyyy-mm-dd")]
ret.commitDate = strings.ReplaceAll(ret.commitDate, "-", "") ret.commitDate = strings.ReplaceAll(ret.commitDate, "-", "")