From ad14bd1bd6b3d6eeca1ead37024ecfa9b2fd7969 Mon Sep 17 00:00:00 2001 From: go75 Date: Mon, 30 Oct 2023 03:30:12 +0000 Subject: [PATCH] cicd: robot automated Change --- pkg/common/version/base.go | 6 +++--- pkg/common/version/types.go | 18 +++++++++--------- pkg/common/version/version.go | 16 ++++++++-------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/pkg/common/version/base.go b/pkg/common/version/base.go index 4161107c1..ac214269f 100644 --- a/pkg/common/version/base.go +++ b/pkg/common/version/base.go @@ -40,8 +40,8 @@ var ( // companion .gitattributes file containing 'export-subst' in this same // directory. See also https://git-scm.com/docs/gitattributes gitVersion string = "latest" - gitCommit string = "" // sha1 from git, output of $(git rev-parse HEAD) - gitTreeState string = "" // state of git tree, either "clean" or "dirty" + gitCommit string = "" // sha1 from git, output of $(git rev-parse HEAD) + gitTreeState string = "" // state of git tree, either "clean" or "dirty" buildDate string = "1970-01-01T00:00:00Z" // build date in ISO8601 format, output of $(date -u +'%Y-%m-%dT%H:%M:%SZ') -) \ No newline at end of file +) diff --git a/pkg/common/version/types.go b/pkg/common/version/types.go index 3512640cc..ee4664149 100644 --- a/pkg/common/version/types.go +++ b/pkg/common/version/types.go @@ -4,15 +4,15 @@ package version // TODO: Add []string of api versions supported? It's still unclear // how we'll want to distribute that information. type Info struct { - Major string `json:"major,omitempty"` - Minor string `json:"minor,omitempty"` - GitVersion string `json:"gitVersion"` + Major string `json:"major,omitempty"` + Minor string `json:"minor,omitempty"` + GitVersion string `json:"gitVersion"` GitTreeState string `json:"gitTreeState,omitempty"` - GitCommit string `json:"gitCommit,omitempty"` - BuildDate string `json:"buildDate"` - GoVersion string `json:"goVersion"` - Compiler string `json:"compiler"` - Platform string `json:"platform"` + GitCommit string `json:"gitCommit,omitempty"` + BuildDate string `json:"buildDate"` + GoVersion string `json:"goVersion"` + Compiler string `json:"compiler"` + Platform string `json:"platform"` } type Output struct { @@ -21,7 +21,7 @@ type Output struct { } type OpenIMClientVersion struct { - ClientVersion string `json:"clientVersion,omitempty" yaml:"clientVersion,omitempty"` //sdk core version + ClientVersion string `json:"clientVersion,omitempty" yaml:"clientVersion,omitempty"` //sdk core version } // String returns info as a human-friendly version string. diff --git a/pkg/common/version/version.go b/pkg/common/version/version.go index b841c3f65..b8ccfaf81 100644 --- a/pkg/common/version/version.go +++ b/pkg/common/version/version.go @@ -13,15 +13,15 @@ func Get() Info { // These variables typically come from -ldflags settings and in // their absence fallback to the settings in ./base.go return Info{ - Major: gitMajor, - Minor: gitMinor, - GitVersion: gitVersion, + Major: gitMajor, + Minor: gitMinor, + GitVersion: gitVersion, GitTreeState: gitTreeState, - GitCommit: gitCommit, - BuildDate: buildDate, - GoVersion: runtime.Version(), - Compiler: runtime.Compiler, - Platform: fmt.Sprintf("%s/%s", runtime.GOOS, runtime.GOARCH), + GitCommit: gitCommit, + BuildDate: buildDate, + GoVersion: runtime.Version(), + Compiler: runtime.Compiler, + Platform: fmt.Sprintf("%s/%s", runtime.GOOS, runtime.GOARCH), } }