Merge pull request #160 from SenseUnit/buildinfo_ver

Use buildinfo for version

Author: Snawoot

.github/workflows/docker-ci.yml

@@ -24,16 +24,6 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      -
-        name: Find Git Tag
-        id: tagger
-        uses: jimschubert/query-tag-action@v2
-        with:
-          include: 'v*'
-          exclude: '*-rc*'
-          commit-ish: 'HEAD'
-          skip-unshallow: 'true'
-          abbrev: 7
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -72,7 +62,6 @@ jobs:
           push: true
           tags: ${{ steps.scratch_meta.outputs.tags }}
           labels: ${{ steps.scratch_meta.outputs.labels }}
-          build-args: 'GIT_DESC=${{steps.tagger.outputs.tag}}'
       -
         name: Docker alpine meta
         id: alpine_meta
@@ -100,4 +89,3 @@ jobs:
           push: true
           tags: ${{ steps.alpine_meta.outputs.tags }}
           labels: ${{ steps.alpine_meta.outputs.labels }}
-          build-args: 'GIT_DESC=${{steps.tagger.outputs.tag}}'

Dockerfile

@@ -1,11 +1,9 @@
 FROM --platform=$BUILDPLATFORM golang AS build
 
-ARG GIT_DESC=undefined
-
 WORKDIR /go/src/github.com/SenseUnit/dumbproxy
 COPY . .
 ARG TARGETOS TARGETARCH
-RUN GOOS=$TARGETOS GOARCH=$TARGETARCH CGO_ENABLED=0 go build -a -tags netgo -ldflags '-s -w -extldflags "-static" -X main.version='"$GIT_DESC"
+RUN GOOS=$TARGETOS GOARCH=$TARGETARCH CGO_ENABLED=0 go build -a -tags netgo -ldflags '-s -w -extldflags "-static"'
 RUN mkdir /.dumbproxy
 
 FROM scratch AS scratch

Makefile

@@ -1,9 +1,8 @@
 PROGNAME = dumbproxy
 OUTSUFFIX = bin/$(PROGNAME)
-VERSION := $(shell git describe)
 BUILDOPTS = -a -tags netgo -trimpath -asmflags -trimpath
-LDFLAGS = -ldflags '-s -w -extldflags "-static" -X main.version=$(VERSION)'
-LDFLAGS_NATIVE = -ldflags '-s -w -X main.version=$(VERSION)'
+LDFLAGS = -ldflags '-s -w -extldflags "-static"'
+LDFLAGS_NATIVE = -ldflags '-s -w'
 
 NDK_CC_ARM = $(abspath ../../ndk-toolchain-arm/bin/arm-linux-androideabi-gcc)
 NDK_CC_ARM64 = $(abspath ../../ndk-toolchain-arm64/bin/aarch64-linux-android21-clang)

main.go

@@ -23,6 +23,7 @@ import (
 	"os/signal"
 	"path/filepath"
 	"runtime"
+	"runtime/debug"
 	"strconv"
 	"strings"
 	"syscall"
@@ -50,10 +51,7 @@ import (
 	_ "golang.org/x/crypto/x509roots/fallback"
 )
 
-var (
-	home, _ = os.UserHomeDir()
-	version = "undefined"
-)
+var home, _ = os.UserHomeDir()
 
 func perror(msg string) {
 	fmt.Fprintln(os.Stderr, "")
@@ -480,7 +478,7 @@ func run() int {
 
 	// handle special invocation modes
 	if args.showVersion {
-		fmt.Println(version)
+		fmt.Println(version())
 		return 0
 	}
 
@@ -1109,6 +1107,14 @@ func readConfig(filename string) error {
 	return nil
 }
 
+func version() string {
+	bi, ok := debug.ReadBuildInfo()
+	if !ok {
+		return "unknown"
+	}
+	return bi.Main.Version
+}
+
 func main() {
 	os.Exit(run())
 }