Version handling fixes (#563)

* Version fixes

Signed-off-by: Karl Hepworth <karl@previousnext.com.au>

Author: fubarhouse

.github/workflows/goreleaser.yml

@@ -29,25 +29,6 @@ jobs:
         uses: actions/setup-go@v4
         with:
           go-version: '1.21'
-      -
-        name: Create version helper
-        run: |
-          cat > service/library/version_state.go << EOF
-          package library
-          import (
-            "fmt"
-            "strings"
-          )
-          var PYGMY_VERSION = "${GITHUB_REF}"
-          func printversion() bool {
-          parts := strings.Split(PYGMY_VERSION, "/")
-          	if PYGMY_VERSION == "" {
-          	  return false
-          	}
-          	fmt.Printf("Pygmy version v%v\n", parts[len(parts)-1])
-          	return true
-          }
-          EOF
       -
         name: Fetch Dependencies
         run: go mod vendor
@@ -65,13 +46,13 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       -
-        name: Check GoReleaser
+        name: Dry-Run GoReleaser
         uses: goreleaser/goreleaser-action@v6
         if: ${{ startsWith(github.ref, 'refs/tags/v') }}
         with:
           distribution: goreleaser
           version: '~> v2'
-          args: release --clean --skip=docker --skip=homebrew --skip=publish
+          args: release --clean --snapshot --skip=docker --skip=homebrew --skip=publish
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       -

.goreleaser.yml

@@ -12,10 +12,17 @@ archives:
     name_template: "{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}_static"
     builds:
       - pygmy-static
+
 builds:
   - id: pygmy
     env:
       - CGO_ENABLED=0
+    ldflags:
+      - -X main.Version={{.Tag}}
+      - -X main.CommitSHA={{.FullCommit}}
+      - -X main.BuildDate={{.CommitDate}}
+      - -X main.GoOS={{.Os}}
+      - -X main.GoArch={{.Arch}}
     goos:
       - linux
       - darwin
@@ -39,6 +46,11 @@ builds:
     flags:
       - -a
     ldflags:
+      - -X main.Version={{.Tag}}
+      - -X main.CommitSHA={{.FullCommit}}
+      - -X main.BuildDate={{.CommitDate}}
+      - -X main.GoOS={{.Os}}
+      - -X main.GoArch={{.Arch}}
       - -extldflags "-static"
     goos:
       - linux
@@ -48,6 +60,9 @@ builds:
       - arm
       - arm64
 
+snapshot:
+  name_template: "{{ .Version }}-SNAPSHOT-{{.ShortCommit}}"
+
 brews:
   - ids:
     - pygmy

cmd/version.go

@@ -21,8 +21,9 @@
 package cmd
 
 import (
-	"github.com/pygmystack/pygmy/service/library"
 	"github.com/spf13/cobra"
+
+	"github.com/pygmystack/pygmy/service/library"
 )
 
 // versionCmd represents the version command

service/library/version.go

@@ -2,18 +2,17 @@ package library
 
 import (
 	"fmt"
+	"runtime/debug"
 )
 
 // Version describes which version of Pygmy is running.
 func Version(c Config) {
+	info, _ := debug.ReadBuildInfo()
 
-	// printversion is updated as static content via GitHub Actions.
-	// If this version is not injected as static content, the version
-	// is deemed unidentifiable - it should be assumed the binary was
-	// compiled outside of official release management.
-	if printversion() {
+	if info.Main.Version == "(devel)" {
+		fmt.Println("Development version")
 		return
 	}
 
-	fmt.Printf("Pygmy version unidentifiable.\n")
+	fmt.Printf("Pygmy %s\n", info.Main.Version)
 }