diff --git a/Makefile b/Makefile index 0fbb430..4fcae1d 100644 --- a/Makefile +++ b/Makefile @@ -6,27 +6,27 @@ build: build-darwin-arm64 build-darwin-x64 build-linux-arm64 build-linux-x64 bui .PHONY: build-darwin-arm64 build-darwin-arm64: - GOOS=darwin GOARCH=arm64 PKG_VERSION=$(PKG_VERSION) go build -o ./dist/moldable-darwin-arm64 + GOOS=darwin GOARCH=arm64 go build -o ./dist/moldable-darwin-arm64 -ldflags "-X main.pkgVersion=$(PKG_VERSION)" .PHONY: build-linux-arm64 build-linux-arm64: - GOOS=linux GOARCH=arm64 PKG_VERSION=$(PKG_VERSION) go build -o ./dist/moldable-linux-arm64 + GOOS=linux GOARCH=arm64 go build -o ./dist/moldable-linux-arm64 -ldflags "-X main.pkgVersion=$(PKG_VERSION)" .PHONY: build-windows-arm64 build-windows-arm64: - GOOS=windows GOARCH=arm64 PKG_VERSION=$(PKG_VERSION) go build -o ./dist/moldable-windows-arm64.exe + GOOS=windows GOARCH=arm64 go build -o ./dist/moldable-windows-arm64.exe -ldflags "-X main.pkgVersion=$(PKG_VERSION)" .PHONY: build-darwin-x64 build-darwin-x64: - GOOS=darwin GOARCH=amd64 PKG_VERSION=$(PKG_VERSION) go build -o ./dist/moldable-darwin-x64 + GOOS=darwin GOARCH=amd64 go build -o ./dist/moldable-darwin-x64 -ldflags "-X main.pkgVersion=$(PKG_VERSION)" .PHONY: build-linux-x64 build-linux-x64: - GOOS=linux GOARCH=amd64 PKG_VERSION=$(PKG_VERSION) go build -o ./dist/moldable-linux-x64 + GOOS=linux GOARCH=amd64 go build -o ./dist/moldable-linux-x64 -ldflags "-X main.pkgVersion=$(PKG_VERSION)" .PHONY: build-windows-x64 build-windows-x64: - GOOS=windows GOARCH=amd64 PKG_VERSION=$(PKG_VERSION) go build -o ./dist/moldable-windows-x64.exe + GOOS=windows GOARCH=amd64 go build -o ./dist/moldable-windows-x64.exe -ldflags "-X main.pkgVersion=$(PKG_VERSION)" test: $(GO_FILES) go.mod go.sum go test -v ./... diff --git a/main.go b/main.go index 8a6592d..b6448c6 100644 --- a/main.go +++ b/main.go @@ -1,7 +1,16 @@ package main -import "github.com/cyberagent-oss/moldable/src/cmd" +import ( + "os" + + "github.com/cyberagent-oss/moldable/src/cmd" +) + +var ( + pkgVersion = "" +) func main() { + os.Setenv("PKG_VERSION", pkgVersion) cmd.Execute() } diff --git a/src/cmd/version.go b/src/cmd/version.go index 0bd17c6..d694cba 100644 --- a/src/cmd/version.go +++ b/src/cmd/version.go @@ -1,7 +1,7 @@ package cmd import ( - "log" + "fmt" "os" "github.com/spf13/cobra" @@ -21,5 +21,5 @@ func init() { } func getVersion() { - log.Println(os.Getenv("PKG_VERSION")) + fmt.Println(os.Getenv("PKG_VERSION")) }