Merge pull request #17 from mbevc1/20230902_refactor_version

feat: Refactor versioning

Author: mbevc1

.gitignore

@@ -2,3 +2,4 @@ react*
 mts.yaml
 vendor/
 backups/
+dist/

.goreleaser.yml

@@ -3,8 +3,8 @@ project_name: react
 source:
   enabled: false
 
-env:
-  - GO111MODULE=on
+#env:
+  #- GO111MODULE=on
   #- GOPROXY=https://gocenter.io
 
 before:
@@ -32,7 +32,10 @@ builds:
       - GOTELEMETRY="off"
     flags:
       - -v
-    ldflags: -X github.com/mbevc1/react/main.Version={{.Env.VERSION}}
+    #ldflags: -X github.com/mbevc1/react/main.Version={{.Env.VERSION}}
+
+upx:
+  - enabled: true
 
 archives:
   - id: react
@@ -62,7 +65,6 @@ release:
   draft: false
   disable: false
 
-
 checksum:
   #name_template: "{{ .ProjectName }}_{{ .Version }}_sha256_checksums.txt"
   name_template: "{{ .ProjectName }}_{{ .Version }}_sha256_checksums.txt"

Makefile

@@ -12,6 +12,7 @@ RED=\033[31;01m
 VER?=dev
 GHASH:=$(shell git rev-parse --short HEAD)
 VERSION?=$(shell git describe --tags --always --dirty --match=v* 2> /dev/null || echo v0)
+GOTELEMETRY:=	off
 GO:=            go
 GO_BUILD:=      go build -mod vendor -ldflags "-s -w -X main.GitCommit=${GHASH} -X main.Version=${VERSION}"
 #VERSION="${VERSION}" goreleaser --snapshot --rm-dist
@@ -30,7 +31,7 @@ vendor: **/*.go ## Build vendor deps
 	GO111MODULE=on $(GO_VENDOR)
 
 clean: clean-vendor ## Clean artefacts
-	rm -rf $(BIN) $(BIN)_* $(BIN).exe go.sum
+	rm -rf $(BIN) $(BIN)_* $(BIN).exe dist/
 
 clean-vendor: ## Clean vendor folder
 	rm -rf vendor
@@ -41,6 +42,9 @@ build: clean $(BIN) ## Build binary
 run:
 	go run .
 
+snapshot: clean ## Build local snapshot
+	goreleaser build --snapshot --clean
+
 dev: clean ## Dev test target
 	go build -ldflags "-s -w -X main.Version=${VER}" -o $(BIN)
 	upx $(BIN)

main.go

@@ -31,13 +31,20 @@ func main() {
 	flag.Parse()
 
 	if *ver {
-		fmt.Printf("%s %v\n", Name, Version)
-		if GitCommit != "" {
-			fmt.Printf("Commit hash: %v\n", GitCommit)
+		fmt.Printf("%s version %v\n", Name, version)
+		if commit != "" {
+			fmt.Printf("commit: %s\n", commit)
 		}
+		fmt.Printf("built at: %s\n", date)
+		fmt.Printf("built by: %s\n", builtBy)
 		os.Exit(0)
 	} else if *cmd == "" && !*bck && !*rbt && !*upg || *hlp {
-		fmt.Printf("%s %v\n", Name, Version)
+		fmt.Printf("%s version %v\n", Name, version)
+		if commit != "" {
+			fmt.Printf("commit: %s\n", commit)
+		}
+		fmt.Printf("built at: %s\n", date)
+		fmt.Printf("built by: %s\n", builtBy)
 		flag.PrintDefaults()
 		if *hlp {
 			os.Exit(0)

version.go

@@ -1,10 +1,13 @@
 package main
 
-//GitCommit The git commit that was compiled. This will be filled in by the compiler.
-var GitCommit string
+// Version current app version
+// var Version = "dev"
+var (
+	version = "dev"
+	commit  = ""
+	date    = ""
+	builtBy = ""
+)
 
-//Version current app version
-var Version = "dev"
-
-//Name of the app
+// Name of the app
 var Name = "ReAcT"