diff --git a/Makefile b/Makefile index c595b1a..28557be 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,7 @@ .PHONY: check lint test fmt build clean VERSION := $(shell git describe --tags --always --dirty 2>/dev/null || echo "dev") -BUILDARCH := $(shell go env GOARCH) -LDFLAGS := -X main.Version=$(VERSION) -X main.Buildarch=$(BUILDARCH) +LDFLAGS := -X main.Version=$(VERSION) # Default target: run all checks check: fmt-check lint test diff --git a/cmd/pixad/main.go b/cmd/pixad/main.go index 2be3a51..5dcaf0b 100644 --- a/cmd/pixad/main.go +++ b/cmd/pixad/main.go @@ -18,9 +18,8 @@ import ( ) var ( - Appname = "pixad" //nolint:gochecknoglobals // set by ldflags - Version string //nolint:gochecknoglobals // set by ldflags - Buildarch string //nolint:gochecknoglobals // set by ldflags + Appname = "pixad" //nolint:gochecknoglobals // set by ldflags + Version string //nolint:gochecknoglobals // set by ldflags ) var configPath string //nolint:gochecknoglobals // cobra flag @@ -43,7 +42,6 @@ func main() { func run(_ *cobra.Command, _ []string) { globals.Appname = Appname globals.Version = Version - globals.Buildarch = Buildarch // Set config path in environment if specified via flag if configPath != "" { diff --git a/internal/globals/globals.go b/internal/globals/globals.go index 3b91ac6..5b86205 100644 --- a/internal/globals/globals.go +++ b/internal/globals/globals.go @@ -7,25 +7,20 @@ import ( // Build-time variables populated from main() via ldflags. var ( - Appname string //nolint:gochecknoglobals // set from main - Version string //nolint:gochecknoglobals // set from main - Buildarch string //nolint:gochecknoglobals // set from main + Appname string //nolint:gochecknoglobals // set from main + Version string //nolint:gochecknoglobals // set from main ) // Globals holds application-wide constants. type Globals struct { - Appname string - Version string - Buildarch string + Appname string + Version string } // New creates a new Globals instance from build-time variables. func New(_ fx.Lifecycle) (*Globals, error) { - n := &Globals{ - Appname: Appname, - Buildarch: Buildarch, - Version: Version, - } - - return n, nil + return &Globals{ + Appname: Appname, + Version: Version, + }, nil } diff --git a/internal/logger/logger.go b/internal/logger/logger.go index 2343a31..a1574f5 100644 --- a/internal/logger/logger.go +++ b/internal/logger/logger.go @@ -4,6 +4,7 @@ package logger import ( "log/slog" "os" + "runtime" "go.uber.org/fx" "sneak.berlin/go/pixa/internal/globals" @@ -72,6 +73,6 @@ func (l *Logger) Identify() { l.log.Info("starting", "appname", l.globals.Appname, "version", l.globals.Version, - "buildarch", l.globals.Buildarch, + "arch", runtime.GOARCH, ) }