Merge branch 'dev'

hjmcloud · Aug 8, 2022 · bf6c6a9 · bf6c6a9
2 parents dfd3ce2 + ba3d482
commit bf6c6a9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -29,7 +29,7 @@ jobs:
 
       - name: Build CLI Binary For All Platform
         run: |
-          gf build main.go -n ${{env.BIN_NAME}} -a all -s linux
+          gf build main.go -n ${{env.BIN_NAME}} -a all -s all -p ./temp
       - name: Move Files Before Release
         run: |
           cd temp

diff --git a/hack/config.yaml b/hack/config.yaml
@@ -2,4 +2,7 @@
 # CLI tool, only in development environment.
 # https://goframe.org/pages/viewpage.action?pageId=3673173
 gfcli:
+  build:
+    varMap:
+      version: "v1.0.1"
 
diff --git a/internal/cmd/version.go b/internal/cmd/version.go
@@ -11,6 +11,7 @@ import (
 type sVersion struct {
 	Name     string //程序名称
 	Homepage string //程序主页
+	Version  string //程序版本
 	GoFrame  string //goframe version
 	Golang   string //golang version
 	Git      string //git commit id
@@ -25,11 +26,14 @@ var (
 		Func: func(ctx context.Context, parser *gcmd.Parser) (err error) {
 			info := gbuild.Info()
 			// gutil.Dump(info)
+			data := gbuild.Data()
+			// gutil.Dump(data)
 
 			// 生成sVersion结构体
 			res := sVersion{
 				Name:     "hjm-certcheck",
 				Homepage: "https://gitee.com/hjmcloud/hjm-certcheck",
+				Version:  data["version"].(string),
 				GoFrame:  info.GoFrame,
 				Golang:   info.Golang,
 				Git:      info.Git,