Reworked the version subcommand

Author: hilli

.goreleaser.yaml

@@ -38,7 +38,12 @@ builds:
     flags:
       - -trimpath
     ldflags:
-      - -s -w -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{ .CommitDate }} -X main.builtBy=goreleaser -X main.treeState={{ .IsGitDirty }}
+      - -s 
+      - -w 
+      - -X github.com/hilli/go-kef-w2/cmd/kefw2/cmd.Version={{.Version}}
+      - -X github.com/hilli/go-kef-w2/cmd/kefw2/cmd.GitCommit={{.Commit}}
+      - -X github.com/hilli/go-kef-w2/cmd/kefw2/cmd.GitBranch=main
+      - -X github.com/hilli/go-kef-w2/cmd/kefw2/cmd.BuildDate={{ .Date }}
 
 archives:
   - formats: [ tar.gz ]

Taskfile.yaml

@@ -5,12 +5,24 @@
 
 version: '3'
 
+vars:
+  GIT_COMMIT:
+    sh: git rev-parse HEAD
+  GIT_SHA:
+    sh: git rev-parse --short HEAD
+  GIT_BRANCH:
+    sh: git branch --show-current
+  LDFLAGS: >-
+    -X github.com/hilli/go-kef-w2/cmd/kefw2/cmd.Version=dev-{{.GIT_SHA}}
+    -X github.com/hilli/go-kef-w2/cmd/kefw2/cmd.GitCommit={{.GIT_COMMIT}}
+    -X github.com/hilli/go-kef-w2/cmd/kefw2/cmd.GitBranch={{.GIT_BRANCH}}
+    -X github.com/hilli/go-kef-w2/cmd/kefw2/cmd.BuildDate={{now | date "2006-01-02T15:04:05Z07:00"}}
 
 tasks:
   build:
     desc: Build binaries
     cmds:
-      - go build -ldflags="-X github.com/hilli/go-kef-w2/cmd.Version={{.GIT_COMMIT}}" -o bin/kefw2{{exeExt}} cmd/kefw2/kefw2.go
+      - go build -ldflags='-s -w {{.LDFLAGS}}' -o bin/kefw2{{exeExt}} cmd/kefw2/kefw2.go
     aliases: [b]
     sources:
       - cmd/kefw2/**/*.go
@@ -49,7 +61,7 @@ tasks:
     desc: Run kefw2
     aliases: [r]
     cmds:
-      - go run -ldflags="-X github.com/hilli/go-kef-w2/cmd.Version=go-kef-w2-git" cmd/kefw2/kefw2.go {{.CLI_ARGS}}
+      - go run -ldflags='{{.LDFLAGS}}' cmd/kefw2/kefw2.go {{.CLI_ARGS}}
 
   all:
     desc: Run all tasks

cmd/kefw2/cmd/root.go

@@ -25,7 +25,6 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
-	"runtime/debug"
 
 	"github.com/hilli/go-kef-w2/kefw2"
 	log "github.com/sirupsen/logrus"
@@ -41,6 +40,10 @@ var (
 	speakers            []kefw2.KEFSpeaker
 	defaultSpeaker      *kefw2.KEFSpeaker
 	currentSpeaker      *kefw2.KEFSpeaker
+	Version             string // Git Tag
+	GitCommit           string // Git commit SHA
+	GitBranch           string // Git branch
+	BuildDate           string // Build date
 )
 
 // rootCmd represents the base command when called without any subcommands
@@ -58,26 +61,12 @@ var VersionCmd = &cobra.Command{
 	Long: "Print the version number of kefw2",
 	Run: func(cmd *cobra.Command, args []string) {
 		fmt.Println("kefw2: Command line tool for controlling KEF's W2 platform speakers")
-		var GitCommit string
-		var BuildDate string
-		if info, ok := debug.ReadBuildInfo(); ok {
-			modified := false
-			for _, v := range info.Settings {
-				switch v.Key {
-				case "vcs.revision":
-					GitCommit = v.Value
-				case "vcs.time":
-					BuildDate = v.Value
-				case "vcs.modified":
-					modified = true
-				}
-				if modified {
-					GitCommit += "-dirty"
-				}
-			}
-		}
 		headerPrinter.Print("Version: ")
+		contentPrinter.Printf("%s\n", Version)
+		headerPrinter.Print("Git commit: ")
 		contentPrinter.Printf("%s\n", GitCommit)
+		headerPrinter.Print("Git branch: ")
+		contentPrinter.Printf("%s\n", GitBranch)
 		headerPrinter.Print("Build date: ")
 		contentPrinter.Printf("%s\n", BuildDate)
 	},