Skip to content

Commit f9802c7

Browse files
committed
Update version output
1 parent a3d6baa commit f9802c7

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
REPO ?= github.com/codekoala/go-aws-lanes
2-
TAG ?= dev
2+
TAG ?= $(shell git rev-parse HEAD)-dev
33
BUILD_DATE := $(shell date +%FT%T%z)
44

55
all: linux osx checksums
@@ -12,7 +12,7 @@ osx:
1212

1313
build: bin
1414
$(eval SUFFIX=_$(GOOS)_$(GOARCH))
15-
go build -ldflags "-s -X $(REPO)/version.Tag=$(TAG) -X $(REPO)/version.BuildDate=$(BUILD_DATE)" -o ./bin/lanes$(SUFFIX) ./cmd/lanes
15+
go build -ldflags "-s -X $(REPO)/version.Commit=$(TAG) -X $(REPO)/version.BuildDate=$(BUILD_DATE)" -o ./bin/lanes$(SUFFIX) ./cmd/lanes
1616

1717
checksums:
1818
cd ./bin/; sha256sum lanes* > SHA256SUMS

cmd/version.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@ var versionCmd = &cobra.Command{
1313
Short: "Display Lanes version",
1414

1515
Run: func(cmd *cobra.Command, args []string) {
16-
cmd.Println("lanes", version.String())
17-
cmd.Println("Build date:", version.BuildDate)
18-
cmd.Println("Go:", runtime.Version())
16+
cmd.Println("lanes", version.Version)
17+
cmd.Println("Commit:\t\t", version.Commit)
18+
cmd.Println("Build date:\t", version.BuildDate)
19+
cmd.Println("Go:\t\t", runtime.Version())
1920
},
2021
}

version/version.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ import (
77

88
var (
99
Version = "v0.1.0"
10-
Tag = "dev"
10+
Commit = "dev"
1111
BuildDate string
1212
)
1313

1414
func String() string {
15-
return fmt.Sprintf("%s-%s", Version, Tag)
15+
return fmt.Sprintf("%s-%s", Version, Commit)
1616
}
1717

1818
func Full() string {

0 commit comments

Comments
 (0)