feat(build): inject build-time version info into binary

Author: thomas-vilte

Makefile

@@ -1,16 +1,35 @@
 SHELL := /bin/bash
 
 BINARY_NAME=matecommit
+VERSION_PKG=github.com/thomas-vilte/matecommit/internal/version
 
-.PHONY: all build test test-race test-grep clean lint help
+# Build variables
+GIT_COMMIT=$(shell git rev-parse --short HEAD 2>/dev/null || echo "dev")
+BUILD_DATE=$(shell date +%F)
+
+# LDFLAGS to inject version information
+LDFLAGS=-ldflags "\
+	-X $(VERSION_PKG).GitCommit=$(GIT_COMMIT) \
+	-X $(VERSION_PKG).BuildDate=$(BUILD_DATE)"
+
+.PHONY: all build build-release test test-race test-grep clean lint help
 
 all: build
 
 build:
 	@echo "Building $(BINARY_NAME)..."
-	@go build -o $(BINARY_NAME) cmd/main.go
+	@echo "  Git Commit: $(GIT_COMMIT)"
+	@echo "  Build Date: $(BUILD_DATE)"
+	@go build $(LDFLAGS) -o $(BINARY_NAME) ./cmd/matecommit/main.go
 	@echo "Build complete: $(BINARY_NAME)"
 
+build-release:
+	@echo "Building $(BINARY_NAME) for release..."
+	@echo "  Git Commit: $(GIT_COMMIT)"
+	@echo "  Build Date: $(BUILD_DATE)"
+	@go build $(LDFLAGS) -trimpath -o $(BINARY_NAME) ./cmd/matecommit/main.go
+	@echo "Release build complete: $(BINARY_NAME)"
+
 test:
 	@echo "Running tests..."
 	@go test -v ./...
@@ -35,7 +54,8 @@ lint:
 
 help:
 	@echo "Available commands:"
-	@echo "  make build       - Build the binary"
+	@echo "  make build       - Build the binary with version info"
+	@echo "  make build-release - Build optimized binary for release"
 	@echo "  make test        - Run standard tests"
 	@echo "  make test-race   - Run tests with race detection (filtered output)"
 	@echo "  make test-grep   - Run tests and grep for failures"

cmd/matecommit/main.go

@@ -32,10 +32,16 @@ import (
 	"github.com/thomas-vilte/matecommit/internal/ui"
 	"github.com/thomas-vilte/matecommit/internal/vcs"
 	"github.com/thomas-vilte/matecommit/internal/vcs/github"
-	"github.com/thomas-vilte/matecommit/internal/version"
+	versionpkg "github.com/thomas-vilte/matecommit/internal/version"
 	"github.com/urfave/cli/v3"
 )
 
+var (
+	version = versionpkg.Version
+	commit  = &versionpkg.GitCommit
+	date    = &versionpkg.BuildDate
+)
+
 func main() {
 	app, err := initializeApp()
 	if err != nil {
@@ -82,7 +88,7 @@ func initializeApp() (*cli.Command, error) {
 	return &cli.Command{
 		Name:                  "mate-commit",
 		Usage:                 translations.GetMessage("app_usage", 0, nil),
-		Version:               version.Version,
+		Version:               versionpkg.Info(),
 		Description:           translations.GetMessage("app_description", 0, nil),
 		Commands:              commands,
 		EnableShellCompletion: true,
@@ -274,7 +280,7 @@ func setupCommands(t *i18n.Translations, cfgApp *cfg.Config, gitService *git.Git
 func startBackgroundVersionCheck() {
 	go func() {
 		checker := services.NewVersionUpdater(
-			services.WithCurrentVersion(version.FullVersion()),
+			services.WithCurrentVersion(versionpkg.FullVersion()),
 		)
 		_, _ = checker.CheckForUpdates(context.Background())
 	}()
@@ -286,7 +292,7 @@ func handleVersionNotification(t *i18n.Translations) {
 		cmdName := args[1]
 		if cmdName != "update" && cmdName != "completion" {
 			checker := services.NewVersionUpdater(
-				services.WithCurrentVersion(version.FullVersion()),
+				services.WithCurrentVersion(versionpkg.FullVersion()),
 			)
 
 			updateInfo, err := checker.GetUpdateInfo()

internal/builder/binary_builder.go

@@ -27,12 +27,13 @@ type BuildTarget struct {
 }
 
 type BinaryBuilder struct {
-	mainPath   string
-	binaryName string
-	version    string
-	commit     string
-	date       string
-	buildDir   string
+	mainPath       string
+	binaryName     string
+	version        string
+	commit         string
+	date           string
+	buildDir       string
+	versionPackage string
 }
 
 type Option func(*BinaryBuilder)
@@ -61,6 +62,12 @@ func WithDate(date string) Option {
 	}
 }
 
+func WithVersionPackage(pkg string) Option {
+	return func(b *BinaryBuilder) {
+		b.versionPackage = pkg
+	}
+}
+
 func NewBinaryBuilder(mainPath, binaryName string, opts ...Option) *BinaryBuilder {
 	b := &BinaryBuilder{
 		mainPath:   mainPath,
@@ -116,12 +123,23 @@ func (b *BinaryBuilder) BuildBinary(ctx context.Context, target BuildTarget) (st
 		outputPath += ".exe"
 	}
 
-	ldflags := fmt.Sprintf(
-		"-s -w -X main.version=%s -X main.commit=%s -X main.date=%s",
-		b.version,
-		b.commit,
-		b.date,
-	)
+	var ldflags string
+	if b.versionPackage != "" {
+		ldflags = fmt.Sprintf(
+			"-s -w -X %s.GitCommit=%s -X %s.BuildDate=%s",
+			b.versionPackage,
+			b.commit,
+			b.versionPackage,
+			b.date,
+		)
+	} else {
+		ldflags = fmt.Sprintf(
+			"-s -w -X main.version=%s -X main.commit=%s -X main.date=%s",
+			b.version,
+			b.commit,
+			b.date,
+		)
+	}
 
 	cmd := exec.CommandContext(ctx, "go", "build",
 		"-o", outputPath,

internal/vcs/github/client.go

@@ -1043,7 +1043,7 @@ func (ghc *GitHubClient) uploadBinaries(ctx context.Context, releaseID int64, ve
 
 	builderBinary := ghc.binaryBuilderFactory.NewBuilder(
 		ghc.mainPath,
-		"matecommit",
+		ghc.repo,
 		builder.WithVersion(version),
 		builder.WithCommit(commit),
 		builder.WithDate(date),
@@ -1054,7 +1054,6 @@ func (ghc *GitHubClient) uploadBinaries(ctx context.Context, releaseID int64, ve
 		"version", version,
 		"build_dir", tempDir)
 
-	// Compilar binarios (el builder enviará eventos de progreso)
 	archives, err := builderBinary.BuildAndPackageAll(ctx, progressCh)
 	if err != nil {
 		return fmt.Errorf("failed to build binaries: %w", err)

internal/vcs/github/client_test.go

@@ -409,7 +409,7 @@ func TestGitHubClient_CreateRelease(t *testing.T) {
 		)
 		client.binaryBuilderFactory = mockFactory
 
-		mockFactory.On("NewBuilder", mock.Anything, "matecommit", mock.Anything).
+		mockFactory.On("NewBuilder", mock.Anything, mock.Anything, mock.Anything).
 			Return(mockPackager)
 
 		tmpFile, err := os.CreateTemp("", "dummy-archive-*.tar.gz")

internal/version/version.go

@@ -4,7 +4,18 @@ package version
 // This version should be updated in each release
 const Version = "1.7.0"
 
+// GitCommit is the git commit hash (injected at build time)
+var GitCommit = "dev"
+
+// BuildDate is the build date (injected at build time)
+var BuildDate = "unknown"
+
 // FullVersion returns the version with the v prefix
 func FullVersion() string {
 	return "v" + Version
 }
+
+// Info returns complete version information
+func Info() string {
+	return "v" + Version + " (commit: " + GitCommit + ", built: " + BuildDate + ")"
+}