Skip to content

Commit

Permalink
remove injected vars to const.go
Browse files Browse the repository at this point in the history
  • Loading branch information
naggie committed Sep 30, 2019
1 parent 236cf8b commit b8efdc0
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 9 deletions.
14 changes: 6 additions & 8 deletions cmd/dstask.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,6 @@ import (
"gopkg.in/yaml.v2"
)

var (
// populated by linker flags, see do-release.sh
GIT_COMMIT = "Unknown"
VERSION = "Unknown"
BUILD_DATE = "Unknown"
)

func main() {
dstask.LoadConfigFromEnv()
context := dstask.LoadContext()
Expand Down Expand Up @@ -327,7 +320,12 @@ func main() {
}

case dstask.CMD_VERSION:
fmt.Printf("Version: %s\nGit commit: %s\nBuild date: %s\n", VERSION, GIT_COMMIT, BUILD_DATE);
fmt.Printf(
"Version: %s\nGit commit: %s\nBuild date: %s\n",
dstask.VERSION,
dstask.GIT_COMMIT,
dstask.BUILD_DATE,
);

case dstask.CMD_COMPLETIONS:
// given the entire user's command line arguments as the arguments for
Expand Down
4 changes: 4 additions & 0 deletions const.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ var (
CONTEXT_FILE = "~/.cache/dstask/context"
// for CI testing
FAKE_PTY = false
// populated by linker flags, see do-release.sh
GIT_COMMIT = "Unknown"
VERSION = "Unknown"
BUILD_DATE = "Unknown"
)

const (
Expand Down
6 changes: 5 additions & 1 deletion do-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,11 @@ BUILD_DATE=$(date)

RELEASE_FILE=RELEASE.md

LDFLAGS="-s -w -X main.GIT_COMMIT=$GIT_COMMIT -X main.VERSION=$VERSION -X \"main.BUILD_DATE=$BUILD_DATE\""
LDFLAGS="-s -w \
-X github.com/naggie/dstask.GIT_COMMIT=$GIT_COMMIT \
-X github.com/naggie/dstask.VERSION=$VERSION \
-X \"github.com/naggie/dstask.BUILD_DATE=$BUILD_DATE\"\
"

# get release information

Expand Down

0 comments on commit b8efdc0

Please sign in to comment.