Fix passing variables during build

feduxorg · Jan 15, 2021 · 73a936b · 73a936b
1 parent 1679f95
commit 73a936b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 22 deletions.
diff --git a/bin/build b/bin/build
@@ -8,5 +8,5 @@ BUILD_DATE=$(date +%FT%T%z)
 VERSION=$(git tag | sort | tail -n 1)
 VERSION=${VERSION/v/};
 
-echo GO111MODULE=on CGO_ENABLED=1 go build  $* -a -installsuffix cgo -ldflags "-w -s -X github.com/feduxorg/letter-generator/letter_generator.AppVersionNumber=${VERSION} -X github.com/feduxorg/letter-generator/letter_generator.CommitHash=${COMMIT_HASH} -X github.com/feduxorg/letter-generator/letter_generator.BuildDate=${BUILD_DATE}" -o dist/${GOOS}/${GOARCH}/lg ./cmd/lg
-GO111MODULE=on CGO_ENABLED=1 go build  $* -a -installsuffix cgo -ldflags "-w -s -X github.com/feduxorg/letter-generator/letter_generator.AppVersionNumber=${VERSION} -X github.com/feduxorg/letter-generator/letter_generator.CommitHash=${COMMIT_HASH} -X github.com/feduxorg/letter-generator/letter_generator.BuildDate=${BUILD_DATE}" -o dist/${GOOS}/${GOARCH}/lg ./cmd/lg
+echo GO111MODULE=on CGO_ENABLED=1 go build  $* -ldflags "-w -s -X main.AppVersionNumber=${VERSION} -X main.CommitHash=${COMMIT_HASH} -X main.BuildDate=${BUILD_DATE}" -o dist/${GOOS}/${GOARCH}/lg ./cmd/lg
+GO111MODULE=on CGO_ENABLED=1 go build  $* -ldflags "-w -s -X main.AppVersionNumber=${VERSION} -X main.CommitHash=${COMMIT_HASH} -X main.BuildDate=${BUILD_DATE}" -o dist/${GOOS}/${GOARCH}/lg ./cmd/lg
diff --git a/cmd/lg/cli.go b/cmd/lg/cli.go
@@ -11,12 +11,21 @@ import (
 	"github.com/urfave/cli"
 )
 
+// The current build version.
+var AppVersionNumber = "dev"
+
+// SHA-value of git commit
+var CommitHash = "HEAD"
+
+// Date of build
+var BuildDate = "NOW"
+
 type Cli struct{}
 
 func (p *Cli) Run(args []string) error {
 	app := cli.NewApp()
 	app.Name = "letter-generator"
-	app.Version = letter_generator.AppVersionNumber + "-" + letter_generator.CommitHash + "-" + letter_generator.GetBuildDate()
+	app.Version = AppVersionNumber + "-" + CommitHash + "-" + BuildDate
 
 	app.Flags = []cli.Flag{
 		cli.BoolFlag{

diff --git a/letter_generator/config.go b/letter_generator/config.go
@@ -2,18 +2,8 @@ package letter_generator
 
 import (
 	"fmt"
-	"time"
 )
 
-// The current build version.
-const AppVersionNumber = "dev"
-
-// SHA-value of git commit
-const CommitHash = "HEAD"
-
-// Date of build
-const BuildDate = ""
-
 type Config struct {
 	ConfigDirectory string `yaml:config_directory`
 	TemplateSource  string `yaml:template_source`
@@ -36,12 +26,3 @@ func (c *Config) ToString() []string {
 
 	return result
 }
-
-func GetBuildDate() string {
-	if BuildDate != "" {
-		return BuildDate
-	} else {
-		t := time.Now()
-		return t.Format(time.RFC3339)
-	}
-}