Merge pull request #40 from imiric/fix/version-output

Expand version output to include Go version and arch info
gzuidhof · Oct 4, 2023 · 50c1ef0 · 50c1ef0
2 parents f0e07f9 + 4bb202e
commit 50c1ef0
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/cmd/buildinfo.go b/cmd/buildinfo.go
@@ -1,11 +1,15 @@
 package cmd
 
+import (
+	"fmt"
+	"runtime"
+)
+
 // Field injected by goreleaser
 var (
 	version    = "<unknown>"
 	commitDate = "date unknown"
 	commit     = ""
-	target     = ""
 )
 
 func Version() string {
@@ -21,5 +25,10 @@ func Commit() string {
 }
 
 func Target() string {
-	return target
+	return runtime.GOOS
+}
+
+func FullVersion() string {
+	return fmt.Sprintf("%s %s/%s %s (%s) %s",
+		version, runtime.GOOS, runtime.GOARCH, runtime.Version(), commitDate, commit)
 }
diff --git a/cmd/root.go b/cmd/root.go
@@ -19,7 +19,7 @@ func Execute() {
 
 	rootCmd.PersistentFlags().
 		String("config", "tygo.yaml", "config file to load (default is tygo.yaml in the current folder)")
-	rootCmd.Version = Version() + " " + Target() + " (" + CommitDate() + ") " + Commit()
+	rootCmd.Version = FullVersion()
 	rootCmd.PersistentFlags().BoolP("debug", "D", false, "Debug mode (prints debug messages)")
 
 	rootCmd.AddCommand(&cobra.Command{

diff --git a/goreleaser.yml b/goreleaser.yml
@@ -8,7 +8,7 @@ builds:
     goarch:
       - amd64
     ldflags:
-      - -s -w -X github.com/gzuidhof/tygo/cmd.version={{.Version}} -X github.com/gzuidhof/tygo/cmd.commit={{.Commit}} -X github.com/gzuidhof/tygo/cmd.commitDate={{.CommitDate}} -X github.com/gzuidhof/tygo/cmd.target={{.Env.GOOS}}
+      - -s -w -X github.com/gzuidhof/tygo/cmd.version={{.Version}} -X github.com/gzuidhof/tygo/cmd.commit={{.Commit}} -X github.com/gzuidhof/tygo/cmd.commitDate={{.CommitDate}}
 archives:
   - id: tygo
     name_template: >-