add version print

csznet · Apr 7, 2024 · f5a42fe · f5a42fe
1 parent 24958ae
commit f5a42fe
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/.github/workflows/go-build.yml b/.github/workflows/go-build.yml
@@ -19,9 +19,9 @@ jobs:
 
     - name: Build Linux arm64
       run: |
-        CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -ldflags "-X main.conf.Version=${GITHUB_REF/refs\/tags\//}" -o goForward main.go
+        CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -ldflags "-X main.version=${GITHUB_REF/refs\/tags\//}" -o goForward main.go
 
-    - name: Zip Linux amd64
+    - name: Zip Linux arm64
       run: |
         sudo apt-get install -y zip
         zip goForward_arm64.zip goForward
@@ -32,15 +32,15 @@ jobs:
 
     - name: Build Linux amd64
       run: |
-        CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags "-X main.conf.Version=${GITHUB_REF/refs\/tags\//}" -o goForward main.go
+        CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags "-X main.version=${GITHUB_REF/refs\/tags\//}" -o goForward main.go
 
     - name: Zip Linux amd64
       run: |
         zip goForward.zip goForward
 
     - name: Build Windows amd64
       run: |
-        CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -ldflags "-X main.conf.Version=${GITHUB_REF/refs\/tags\//}" -o goForward.exe main.go
+        CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -ldflags "-X main.version=${GITHUB_REF/refs\/tags\//}" -o goForward.exe main.go
 
     - name: Zip Windows amd64
       run: |

diff --git a/conf/conf.go b/conf/conf.go
@@ -39,6 +39,3 @@ var WebPass string
 
 // TCP超时
 var TcpTimeout int
-
-// 版本号
-var Version string
diff --git a/main.go b/main.go
@@ -11,9 +11,11 @@ import (
 	"csz.net/goForward/web"
 )
 
+var version string
+
 func main() {
-	if conf.Version != "" {
-		fmt.Println("goForward Version " + conf.Version)
+	if version != "" {
+		fmt.Println("goForward Version " + version)
 	}
 	go web.Run()
 	if conf.TcpTimeout < 5 {