From 709195848a50c18faa38c00b7d20ed838cc37e5a Mon Sep 17 00:00:00 2001 From: rob boll Date: Wed, 12 Apr 2017 11:13:51 -0400 Subject: [PATCH] add version from git tag --- Makefile | 2 +- main.go | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 1b517df7..1b1d43cf 100644 --- a/Makefile +++ b/Makefile @@ -22,7 +22,7 @@ test: .PHONY: test cross: - gox -os '!freebsd !netbsd' -arch '!arm' -output "dist/{{.Dir}}_{{.OS}}_{{.Arch}}" ${TARGETS} + gox -os '!freebsd !netbsd' -arch '!arm' -output "dist/{{.Dir}}_{{.OS}}_{{.Arch}}" -ldflags '-X main.Version=${TAG}' ${TARGETS} .PHONY: cross pristine: generate fmt diff --git a/main.go b/main.go index 3876e7da..e48df5f0 100644 --- a/main.go +++ b/main.go @@ -16,12 +16,14 @@ const ( helmfile = "charts.yaml" ) +var Version string + func main() { app := cli.NewApp() app.Name = "helmfile" app.Usage = "" - app.Version = "0.1.0" + app.Version = Version app.Flags = []cli.Flag{ cli.StringFlag{ Name: "file, f", @@ -33,7 +35,7 @@ func main() { Usage: "silence output", }, cli.StringFlag{ - Name: "kube-context", + Name: "kube-context", Usage: "Set kubectl context. Uses current context by default", }, } @@ -79,7 +81,7 @@ func main() { Usage: "pass args to helm exec", }, cli.StringSliceFlag{ - Name: "values", + Name: "values", Usage: "additional value files to be merged into the command", }, }, @@ -110,7 +112,7 @@ func main() { Usage: "sync all resources from state file (repos && charts)", Flags: []cli.Flag{ cli.StringSliceFlag{ - Name: "values", + Name: "values", Usage: "additional value files to be merged into the command", }, },