Skip to content
This repository was archived by the owner on May 11, 2022. It is now read-only.

Commit 08b54eb

Browse files
committed
sync makefile
1 parent 8bc235e commit 08b54eb

File tree

3 files changed

+42
-4
lines changed

3 files changed

+42
-4
lines changed

Makefile

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# sourced by https://github.com/octomation/makefiles
22

33
.DEFAULT_GOAL = test-with-coverage
4+
GO_VERSIONS = 1.12 1.13 1.14
45

56
SHELL = /bin/bash -euo pipefail
67

@@ -183,18 +184,22 @@ toolset:
183184
go generate tools.go; \
184185
)
185186

187+
ifdef GO_VERSIONS
188+
186189
define go_tpl
187190
.PHONY: go$(1)
188191
go$(1):
189-
docker run \
192+
@docker run \
190193
--rm -it \
191194
-v $(PWD):/src \
192195
-w /src \
193196
golang:$(1) bash
194197
endef
195198

196199
render_go_tpl = $(eval $(call go_tpl,$(version)))
197-
$(foreach version,1.12 1.13 1.14,$(render_go_tpl))
200+
$(foreach version,$(GO_VERSIONS),$(render_go_tpl))
201+
202+
endif
198203

199204

200205
.PHONY: clean

cmd/client/main.go

+21
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,24 @@
11
package main
22

3+
import (
4+
"fmt"
5+
"runtime/debug"
6+
)
7+
8+
const unknown = "unknown"
9+
10+
var (
11+
commit = unknown
12+
date = unknown
13+
version = "dev"
14+
)
15+
16+
//nolint:gochecknoinits
17+
func init() {
18+
if info, available := debug.ReadBuildInfo(); available && commit == unknown {
19+
version = info.Main.Version
20+
commit = fmt.Sprintf("%s, mod sum: %s", commit, info.Main.Sum)
21+
}
22+
}
23+
324
func main() {}

cmd/server/main.go

+14-2
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,33 @@
11
package main
22

33
import (
4+
"fmt"
45
"log"
56
"net/http"
7+
"runtime/debug"
68

79
"github.com/go-chi/cors"
810

911
v1 "go.octolab.org/ecosystem/tablo/internal/generated/api/v1"
1012
server "go.octolab.org/ecosystem/tablo/internal/server/v1"
1113
)
1214

15+
const unknown = "unknown"
16+
1317
var (
14-
commit = "none"
15-
date = "unknown"
18+
commit = unknown
19+
date = unknown
1620
version = "dev"
1721
)
1822

23+
//nolint:gochecknoinits
24+
func init() {
25+
if info, available := debug.ReadBuildInfo(); available && commit == unknown {
26+
version = info.Main.Version
27+
commit = fmt.Sprintf("%s, mod sum: %s", commit, info.Main.Sum)
28+
}
29+
}
30+
1931
func main() {
2032
log.Printf("{commit: %q, date: %q, version: %q, port: 8080}\n", commit, date, version)
2133

0 commit comments

Comments
 (0)