use proto version data

ethpandaops · Oct 7, 2024 · a12193c · a12193c
1 parent 58cedcb
commit a12193c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 13 deletions.
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
@@ -16,7 +16,7 @@ builds:
     goarch: 
     - amd64
     ldflags:
-      - -s -w -X github.com/ethpandaops/xatu/pkg/proto/xatu.Release={{.Tag}} -X github.com/ethpandaops/xatu/pkg/proto/xatu.GitCommit={{.ShortCommit}} -X github.com/ethpandaops/xatu/cmd.release={{.Tag}} -X github.com/ethpandaops/xatu/cmd.commit={{.ShortCommit}} -X github.com/ethpandaops/xatu/cmd.platform={{.Runtime.Goos}}/{{.Runtime.Goarch}}
+      - -s -w -X github.com/ethpandaops/xatu/pkg/proto/xatu.Release={{.Tag}} -X github.com/ethpandaops/xatu/pkg/proto/xatu.GitCommit={{.ShortCommit}} -X github.com/ethpandaops/xatu/pkg/proto/xatu.GOOS={{.Runtime.Goos}} -X github.com/ethpandaops/xatu/pkg/proto/xatu.GOARCH={{.Runtime.Goarch}}
     mod_timestamp: "{{ .CommitTimestamp }}"
 
   - id: linux-arm64
@@ -30,7 +30,7 @@ builds:
     goarch: 
     - arm64
     ldflags:
-      - -s -w -X github.com/ethpandaops/xatu/pkg/proto/xatu.Release={{.Tag}} -X github.com/ethpandaops/xatu/pkg/proto/xatu.GitCommit={{.ShortCommit}} -X github.com/ethpandaops/xatu/cmd.release={{.Tag}} -X github.com/ethpandaops/xatu/cmd.commit={{.ShortCommit}} -X github.com/ethpandaops/xatu/cmd.platform={{.Runtime.Goos}}/{{.Runtime.Goarch}}
+      - -s -w -X github.com/ethpandaops/xatu/pkg/proto/xatu.Release={{.Tag}} -X github.com/ethpandaops/xatu/pkg/proto/xatu.GitCommit={{.ShortCommit}} -X github.com/ethpandaops/xatu/pkg/proto/xatu.GOOS={{.Runtime.Goos}} -X github.com/ethpandaops/xatu/pkg/proto/xatu.GOARCH={{.Runtime.Goarch}}
     mod_timestamp: "{{ .CommitTimestamp }}"
 
   - id: windows-amd64
@@ -44,7 +44,7 @@ builds:
     goarch:
     - amd64
     ldflags:
-      - -s -w -X github.com/ethpandaops/xatu/pkg/proto/xatu.Release={{.Tag}} -X github.com/ethpandaops/xatu/pkg/proto/xatu.GitCommit={{.ShortCommit}} -X github.com/ethpandaops/xatu/cmd.release={{.Tag}} -X github.com/ethpandaops/xatu/cmd.commit={{.ShortCommit}} -X github.com/ethpandaops/xatu/cmd.platform={{.Runtime.Goos}}/{{.Runtime.Goarch}}
+      - -s -w -X github.com/ethpandaops/xatu/pkg/proto/xatu.Release={{.Tag}} -X github.com/ethpandaops/xatu/pkg/proto/xatu.GitCommit={{.ShortCommit}} -X github.com/ethpandaops/xatu/pkg/proto/xatu.GOOS={{.Runtime.Goos}} -X github.com/ethpandaops/xatu/pkg/proto/xatu.GOARCH={{.Runtime.Goarch}}
     mod_timestamp: "{{ .CommitTimestamp }}"
 
   - id: darwin-amd64
@@ -58,7 +58,7 @@ builds:
     goarch:
     - amd64
     ldflags:
-      - -s -w -X github.com/ethpandaops/xatu/pkg/proto/xatu.Release={{.Tag}} -X github.com/ethpandaops/xatu/pkg/proto/xatu.GitCommit={{.ShortCommit}} -X github.com/ethpandaops/xatu/cmd.release={{.Tag}} -X github.com/ethpandaops/xatu/cmd.commit={{.ShortCommit}} -X github.com/ethpandaops/xatu/cmd.platform={{.Runtime.Goos}}/{{.Runtime.Goarch}}
+      - -s -w -X github.com/ethpandaops/xatu/pkg/proto/xatu.Release={{.Tag}} -X github.com/ethpandaops/xatu/pkg/proto/xatu.GitCommit={{.ShortCommit}} -X github.com/ethpandaops/xatu/pkg/proto/xatu.GOOS={{.Runtime.Goos}} -X github.com/ethpandaops/xatu/pkg/proto/xatu.GOARCH={{.Runtime.Goarch}}
     mod_timestamp: "{{ .CommitTimestamp }}"
 
   - id: darwin-arm64
@@ -72,7 +72,7 @@ builds:
     goarch:
     - arm64
     ldflags:
-      - -s -w -X github.com/ethpandaops/xatu/pkg/proto/xatu.Release={{.Tag}} -X github.com/ethpandaops/xatu/pkg/proto/xatu.GitCommit={{.ShortCommit}} -X github.com/ethpandaops/xatu/cmd.release={{.Tag}} -X github.com/ethpandaops/xatu/cmd.commit={{.ShortCommit}} -X github.com/ethpandaops/xatu/cmd.platform={{.Runtime.Goos}}/{{.Runtime.Goarch}}
+      - -s -w -X github.com/ethpandaops/xatu/pkg/proto/xatu.Release={{.Tag}} -X github.com/ethpandaops/xatu/pkg/proto/xatu.GitCommit={{.ShortCommit}} -X github.com/ethpandaops/xatu/pkg/proto/xatu.GOOS={{.Runtime.Goos}} -X github.com/ethpandaops/xatu/pkg/proto/xatu.GOARCH={{.Runtime.Goarch}}
     mod_timestamp: "{{ .CommitTimestamp }}"
 checksum:
   name_template: 'checksums.txt'

diff --git a/cmd/version.go b/cmd/version.go
@@ -3,21 +3,16 @@ package cmd
 import (
 	"fmt"
 
+	"github.com/ethpandaops/xatu/pkg/proto/xatu"
 	"github.com/spf13/cobra"
 )
 
-var (
-	release  = "dev"
-	commit   = "unknown"
-	platform = "unknown"
-)
-
 var versionCmd = &cobra.Command{
 	Use:   "version",
 	Short: "Prints the version of Xatu.",
 	Long:  `Prints the version of Xatu.`,
 	Run: func(cmd *cobra.Command, args []string) {
-		fmt.Printf("xatu version %s %s %s\n", release, commit, platform)
+		fmt.Printf("xatu version %s %s %s/%s\n", xatu.Release, xatu.GitCommit, xatu.GOOS, xatu.GOARCH)
 	},
 }
 

diff --git a/pkg/proto/xatu/xatu.go b/pkg/proto/xatu/xatu.go
@@ -10,6 +10,8 @@ var (
 	Release        = "dev"
 	GitCommit      = "dev"
 	Implementation = "Xatu"
+	GOOS           = runtime.GOOS
+	GOARCH         = runtime.GOARCH
 )
 
 func Full() string {
@@ -29,7 +31,7 @@ func Short() string {
 }
 
 func FullVWithGOOS() string {
-	return fmt.Sprintf("%s/%s", Full(), runtime.GOOS)
+	return fmt.Sprintf("%s/%s", Full(), GOOS)
 }
 
 func ImplementationLower() string {