mirror of
https://github.com/gogf/gf.git
synced 2025-04-05 11:18:50 +08:00
feat: gbuild add BuiltVersion (#2754)
This commit is contained in:
parent
c0dff1dc16
commit
b99db92113
@ -17,6 +17,7 @@ import (
|
||||
|
||||
"github.com/gogf/gf/v2/encoding/gbase64"
|
||||
"github.com/gogf/gf/v2/frame/g"
|
||||
"github.com/gogf/gf/v2/os/gbuild"
|
||||
"github.com/gogf/gf/v2/os/gcmd"
|
||||
"github.com/gogf/gf/v2/os/genv"
|
||||
"github.com/gogf/gf/v2/os/gfile"
|
||||
@ -311,8 +312,9 @@ func (c cBuild) getBuildInVarStr(ctx context.Context, in cBuildInput) string {
|
||||
if buildInVarMap == nil {
|
||||
buildInVarMap = make(g.Map)
|
||||
}
|
||||
buildInVarMap["builtGit"] = c.getGitCommit(ctx)
|
||||
buildInVarMap["builtTime"] = gtime.Now().String()
|
||||
buildInVarMap[gbuild.BuiltGit] = c.getGitCommit(ctx)
|
||||
buildInVarMap[gbuild.BuiltTime] = gtime.Now().String()
|
||||
buildInVarMap[gbuild.BuiltVersion] = in.Version
|
||||
b, err := json.Marshal(buildInVarMap)
|
||||
if err != nil {
|
||||
mlog.Fatal(err)
|
||||
|
@ -24,14 +24,16 @@ type BuildInfo struct {
|
||||
Golang string // Built used Golang version.
|
||||
Git string // Built used git repo. commit id and datetime.
|
||||
Time string // Built datetime.
|
||||
Version string // Built version.
|
||||
Data map[string]interface{} // All custom built data key-value pairs.
|
||||
}
|
||||
|
||||
const (
|
||||
gfVersion = `gfVersion`
|
||||
goVersion = `goVersion`
|
||||
builtGit = `builtGit`
|
||||
builtTime = `builtTime`
|
||||
gfVersion = `gfVersion`
|
||||
goVersion = `goVersion`
|
||||
BuiltGit = `builtGit`
|
||||
BuiltTime = `builtTime`
|
||||
BuiltVersion = `builtVersion`
|
||||
)
|
||||
|
||||
var (
|
||||
@ -61,8 +63,9 @@ func Info() BuildInfo {
|
||||
return BuildInfo{
|
||||
GoFrame: Get(gfVersion).String(),
|
||||
Golang: Get(goVersion).String(),
|
||||
Git: Get(builtGit).String(),
|
||||
Time: Get(builtTime).String(),
|
||||
Git: Get(BuiltGit).String(),
|
||||
Time: Get(BuiltTime).String(),
|
||||
Version: Get(BuiltVersion).String(),
|
||||
Data: Data(),
|
||||
}
|
||||
}
|
||||
|
@ -22,6 +22,7 @@ func Test_Info(t *testing.T) {
|
||||
"Golang": "",
|
||||
"Git": "",
|
||||
"Time": "",
|
||||
"Version": "",
|
||||
"Data": g.Map{},
|
||||
})
|
||||
})
|
||||
|
Loading…
x
Reference in New Issue
Block a user