Skip to content
This repository was archived by the owner on Nov 20, 2021. It is now read-only.

Commit 92e1bf2

Browse files
committed
Add additional version info
1 parent a798f27 commit 92e1bf2

File tree

4 files changed

+15
-6
lines changed

4 files changed

+15
-6
lines changed

.goreleaser.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ builds:
2222
- all=-trimpath={{.Env.GOPATH}}
2323
ldflags:
2424
- -s -w
25-
- -X github.com/criticalstack/e2d/pkg/buildinfo.Version={{.Tag}}
26-
- -X github.com/criticalstack/e2d/pkg/buildinfo.GitSHA={{.ShortCommit}}
27-
- -X github.com/criticalstack/e2d/pkg/buildinfo.Date={{.Date}}
25+
- -X "github.com/criticalstack/e2d/pkg/buildinfo.Date={{.Date}}"
26+
- -X "github.com/criticalstack/e2d/pkg/buildinfo.GitSHA={{.ShortCommit}}"
27+
- -X "github.com/criticalstack/e2d/pkg/buildinfo.Version={{.Tag}}"
2828
archives:
2929
- replacements:
3030
darwin: Darwin

Makefile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,17 @@ ifneq ($(GIT_TAG),)
2828
VERSION = $(GIT_TAG)
2929
endif
3030

31-
LDFLAGS += -X github.com/criticalstack/e2d/pkg/buildinfo.GitSHA=$(GIT_SHA)
32-
LDFLAGS += -X github.com/criticalstack/e2d/pkg/buildinfo.Version=$(VERSION)
31+
LDFLAGS += -X "github.com/criticalstack/e2d/pkg/buildinfo.Date=$(shell date -u +'%Y-%m-%dT%TZ'))"
32+
LDFLAGS += -X "github.com/criticalstack/e2d/pkg/buildinfo.GitSHA=$(GIT_SHA)"
33+
LDFLAGS += -X "github.com/criticalstack/e2d/pkg/buildinfo.Version=$(VERSION)"
3334
GOFLAGS = -gcflags "all=-trimpath=$(PWD)" -asmflags "all=-trimpath=$(PWD)"
3435

3536
GO_BUILD_ENV_VARS := GO111MODULE=on CGO_ENABLED=0
3637

3738
.PHONY: build test test-manager clean
3839

3940
build: clean ## Build the e2d golang binary
40-
@$(GO_BUILD_ENV_VARS) go build -o bin/e2d $(GOFLAGS) -ldflags '$(LDFLAGS)' ./cmd/e2d
41+
$(GO_BUILD_ENV_VARS) go build -o bin/e2d $(GOFLAGS) -ldflags '$(LDFLAGS)' ./cmd/e2d
4142

4243
test: ## Run all tests
4344
go test ./...

cmd/e2d/app/version.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ func newVersionCmd() *cobra.Command {
2323
"Version": buildinfo.Version,
2424
"GitSHA": buildinfo.GitSHA,
2525
},
26+
"build": {
27+
"Date": buildinfo.Date,
28+
"GoVersion": buildinfo.GoVersion,
29+
},
2630
})
2731
if err != nil {
2832
log.Fatal(err)

pkg/buildinfo/version.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,14 @@
22
// available at run time.
33
package buildinfo
44

5+
import "runtime"
6+
57
var (
68
Date string
79

810
GitSHA string
911

12+
GoVersion = runtime.Version()
13+
1014
Version string
1115
)

0 commit comments

Comments
 (0)