From 24958ae336cb964c1912e432107f9e4c686c7ae2 Mon Sep 17 00:00:00 2001 From: csznet Date: Sun, 7 Apr 2024 14:10:07 +0800 Subject: [PATCH] add version print --- .github/workflows/go-build.yml | 9 +++------ conf/conf.go | 3 +++ main.go | 4 ++++ 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/go-build.yml b/.github/workflows/go-build.yml index ee96a49..962b59e 100644 --- a/.github/workflows/go-build.yml +++ b/.github/workflows/go-build.yml @@ -1,6 +1,3 @@ -# This workflow will build a golang project -# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-go - name: Go on: @@ -22,7 +19,7 @@ jobs: - name: Build Linux arm64 run: | - CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -o goForward main.go + CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -ldflags "-X main.conf.Version=${GITHUB_REF/refs\/tags\//}" -o goForward main.go - name: Zip Linux amd64 run: | @@ -35,7 +32,7 @@ jobs: - name: Build Linux amd64 run: | - CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o goForward main.go + CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags "-X main.conf.Version=${GITHUB_REF/refs\/tags\//}" -o goForward main.go - name: Zip Linux amd64 run: | @@ -43,7 +40,7 @@ jobs: - name: Build Windows amd64 run: | - CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -o goForward.exe main.go + CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -ldflags "-X main.conf.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 index e8f0922..29411c1 100644 --- a/conf/conf.go +++ b/conf/conf.go @@ -39,3 +39,6 @@ var WebPass string // TCP超时 var TcpTimeout int + +// 版本号 +var Version string diff --git a/main.go b/main.go index 2567d9f..d6ceaf9 100644 --- a/main.go +++ b/main.go @@ -2,6 +2,7 @@ package main import ( "flag" + "fmt" "sync" "csz.net/goForward/conf" @@ -11,6 +12,9 @@ import ( ) func main() { + if conf.Version != "" { + fmt.Println("goForward Version " + conf.Version) + } go web.Run() if conf.TcpTimeout < 5 { conf.TcpTimeout = 5