fix: wrong variable name in goreleaser

3 files · +5 -4

M .goreleaser.yaml +1 -1


@@ -21,7 +21,7 @@ builds:
21	21		env:
22	22		- CGO_ENABLED=0
23	23		ldflags:
24		-	- -s -w -X main.build={{.Version}} -X main.commit={{.Commit}} -X main.date={{.Date}}
	24	+	- -s -w -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.Date}}
25	25
26	26		dockers:
27	27		- image_templates:


@@ -21,7 +21,7 @@ builds:
21		env:	21		env:
22		- CGO_ENABLED=0	22		- CGO_ENABLED=0
23		ldflags:	23		ldflags:
24	-	- -s -w -X main.build={{.Version}} -X main.commit={{.Commit}} -X main.date={{.Date}}	24	+	- -s -w -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.Date}}
25			25
26		dockers:	26		dockers:
27		- image_templates:	27		- image_templates:

M internal/server/new_server.go +4 -1


@@ -2,12 +2,12 @@ package server
2	2
3	3		import (
4	4		"io"
5		-	"log"
6	5		"time"
7	6
8	7		"github.com/bnema/gordon/internal/common"
9	8		"github.com/bnema/gordon/internal/templating"
10	9		"github.com/bnema/gordon/internal/webui"
	10	+	"github.com/charmbracelet/log"
11	11		)
12	12
13	13		func NewServerApp(buildConfig common.BuildConfig) (App, error) {

@@ -15,6 +15,9 @@ func NewServerApp(buildConfig common.BuildConfig) (App, error) {
15	15		config := common.Config{
16	16		Build: *buildConfig,
17	17		}
	18	+
	19	+	log.Info("Starting Gordon server", "version", config.Build.BuildVersion)
	20	+
18	21		_, err := config.LoadConfig()
19	22		if err != nil {
20	23		log.Fatalf("Failed to load configuration: %v", err)

 import (
 	"io"
-	"log"
 	"time"
 	"github.com/bnema/gordon/internal/common"
 	"github.com/bnema/gordon/internal/templating"
 	"github.com/bnema/gordon/internal/webui"
+	"github.com/charmbracelet/log"
 )
 func NewServerApp(buildConfig *common.BuildConfig) (*App, error) {
 	config := common.Config{
 		Build: *buildConfig,
 	}
+	log.Info("Starting Gordon server", "version", config.Build.BuildVersion)
 	_, err := config.LoadConfig()
 	if err != nil {
 		log.Fatalf("Failed to load configuration: %v", err)

M main.go +0 -2


@@ -2,7 +2,6 @@ package main
2	2
3	3		import (
4	4		"github.com/bnema/gordon/cmd"
5		-	"github.com/charmbracelet/log"
6	5		)
7	6
8	7		var (

@@ -12,6 +11,5 @@ var (
12	11		)
13	12
14	13		func main() {
15		-	log.Info("Starting Gordon", "version", version, "commit", commit, "date", date)
16	14		cmd.ExecuteCLI(version, commit, date)
17	15		}


@@ -2,7 +2,6 @@ package main
2			2
3		import (	3	import (
4		"github.com/bnema/gordon/cmd"	4	"github.com/bnema/gordon/cmd"
5	-	"github.com/charmbracelet/log"
6		)	5	)
7			6
8		var (	7	var (

@@ -12,6 +11,5 @@ var (
12		)	11	)
13			12
14		func main() {	13	func main() {
15	-	log.Info("Starting Gordon", "version", version, "commit", commit, "date", date)
16		cmd.ExecuteCLI(version, commit, date)	14	cmd.ExecuteCLI(version, commit, date)
17		}	15	}