From ae469f9fd3c085625f4df92c831ea5c0b1f5ce56 Mon Sep 17 00:00:00 2001 From: Carolyn Van Slyck Date: Thu, 8 Mar 2018 19:02:13 -0600 Subject: [PATCH] Fix version stamp --- Makefile | 4 +++- cmd/svcatt/main.go | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 42b6408..5b53f3a 100644 --- a/Makefile +++ b/Makefile @@ -85,7 +85,7 @@ clean: -rm build/service-catalog-templates/service-catalog-templates svcatt: pkg/client - go build -o bin/svcatt ./cmd/svcatt + go build -o bin/svcatt -ldflags '$(LDFLAGS)' ./cmd/svcatt svcatt-linux: GOOS=linux GOARCH=amd64 $(XBUILD) -o $(RELEASE_DIR)/Linux/x86_64/svcatt ./cmd/svcatt @@ -111,3 +111,5 @@ publish-cli: clean svcatt-all publish-charts: clean ./build/publish-charts.sh + +.PHONY: svcatt diff --git a/cmd/svcatt/main.go b/cmd/svcatt/main.go index 1d6efe2..9df3d2a 100644 --- a/cmd/svcatt/main.go +++ b/cmd/svcatt/main.go @@ -12,6 +12,7 @@ import ( "github.com/Azure/service-catalog-templates/cmd/svcatt/instance-template" "github.com/Azure/service-catalog-templates/cmd/svcatt/templated-binding" "github.com/Azure/service-catalog-templates/cmd/svcatt/templated-instance" + "github.com/Azure/service-catalog-templates/pkg" "github.com/Azure/service-catalog-templates/pkg/svcatt" "github.com/kubernetes-incubator/service-catalog/cmd/svcat/binding" "github.com/kubernetes-incubator/service-catalog/cmd/svcat/broker" @@ -19,7 +20,6 @@ import ( "github.com/kubernetes-incubator/service-catalog/cmd/svcat/instance" "github.com/kubernetes-incubator/service-catalog/cmd/svcat/plan" "github.com/kubernetes-incubator/service-catalog/cmd/svcat/plugin" - "github.com/kubernetes-incubator/service-catalog/pkg" "github.com/spf13/cobra" "github.com/spf13/pflag" "github.com/spf13/viper" @@ -93,7 +93,7 @@ func buildRootCommand() *cobra.Command { } func printVersion(cxt *svcattcommand.Context) { - fmt.Fprintf(cxt.Output, "svcatt %s (with Templates support)\n", pkg.VERSION) + fmt.Fprintf(cxt.Output, "svcatt %s (with Templates support)\n", pkg.Version) } func newSyncCmd(cxt *svcattcommand.Context) *cobra.Command {