Skip to content

Commit ecb74dd

Browse files
committed
Add build datetime to version command output
1 parent df8c924 commit ecb74dd

File tree

3 files changed

+29
-7
lines changed

3 files changed

+29
-7
lines changed

Diff for: .goreleaser.yml

+20-5
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,10 @@ builds:
3131
goarch:
3232
- amd64
3333
ldflags:
34-
- -s -w -X github.com/arduino/arduino-cli/version.versionString={{.Tag}} -X github.com/arduino/arduino-cli/version.commit={{ .ShortCommit }}
34+
- -s -w
35+
- -X github.com/arduino/arduino-cli/version.versionString={{.Tag}}
36+
- -X github.com/arduino/arduino-cli/version.commit={{ .ShortCommit }}
37+
- -X github.com/arduino/arduino-cli/version.date={{.Date}}
3538
- # ARM
3639
id: arduino_cli_arm
3740
binary: arduino-cli
@@ -45,7 +48,10 @@ builds:
4548
goarm:
4649
- 6
4750
ldflags:
48-
- -s -w -X github.com/arduino/arduino-cli/version.versionString={{.Tag}} -X github.com/arduino/arduino-cli/version.commit={{ .ShortCommit }}
51+
- -s -w
52+
- -X github.com/arduino/arduino-cli/version.versionString={{.Tag}}
53+
- -X github.com/arduino/arduino-cli/version.commit={{ .ShortCommit }}
54+
- -X github.com/arduino/arduino-cli/version.date={{.Date}}
4955
- "-extldflags '-static'"
5056
- # ARMv7
5157
id: arduino_cli_armv7
@@ -60,7 +66,10 @@ builds:
6066
goarm:
6167
- 7
6268
ldflags:
63-
- -s -w -X github.com/arduino/arduino-cli/version.versionString={{.Tag}} -X github.com/arduino/arduino-cli/version.commit={{ .ShortCommit }}
69+
- -s -w
70+
- -X github.com/arduino/arduino-cli/version.versionString={{.Tag}}
71+
- -X github.com/arduino/arduino-cli/version.commit={{ .ShortCommit }}
72+
- -X github.com/arduino/arduino-cli/version.date={{.Date}}
6473
- "-extldflags '-static'"
6574
- # ARM64
6675
id: arduino_cli_arm64
@@ -73,7 +82,10 @@ builds:
7382
goarch:
7483
- arm64
7584
ldflags:
76-
- -s -w -X github.com/arduino/arduino-cli/version.versionString={{.Tag}} -X github.com/arduino/arduino-cli/version.commit={{ .ShortCommit }}
85+
- -s -w
86+
- -X github.com/arduino/arduino-cli/version.versionString={{.Tag}}
87+
- -X github.com/arduino/arduino-cli/version.commit={{ .ShortCommit }}
88+
- -X github.com/arduino/arduino-cli/version.date={{.Date}}
7789
- "-extldflags '-static'"
7890
- # All the other platforms
7991
id: arduino_cli
@@ -87,7 +99,10 @@ builds:
8799
- amd64
88100
- 386
89101
ldflags:
90-
- -s -w -X github.com/arduino/arduino-cli/version.versionString={{.Tag}} -X github.com/arduino/arduino-cli/version.commit={{ .ShortCommit }}
102+
- -s -w
103+
- -X github.com/arduino/arduino-cli/version.versionString={{.Tag}}
104+
- -X github.com/arduino/arduino-cli/version.commit={{ .ShortCommit }}
105+
- -X github.com/arduino/arduino-cli/version.date={{.Date}}
91106
- "-extldflags '-static'"
92107

93108
archives:

Diff for: Taskfile.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -202,15 +202,19 @@ vars:
202202
# build vars
203203
COMMIT:
204204
sh: echo ${TRAVIS_COMMIT:-`git log -n 1 --format=%h`}
205+
TIMESTAMP:
206+
sh: echo "$(date -u +"%Y-%m-%dT%H:%M:%SZ")"
205207
LDFLAGS: >
206-
-ldflags '-X github.com/arduino/arduino-cli/version.commit={{.COMMIT}}'
208+
-ldflags '-X github.com/arduino/arduino-cli/version.commit={{.COMMIT}}
209+
-X github.com/arduino/arduino-cli/version.date={{.TIMESTAMP}}'
207210
# test vars
208211
GOFLAGS: "-timeout 10m -v -coverpkg=./... -covermode=atomic"
209212
TEST_VERSIONSTRING: "0.0.0-test.preview"
210213
TEST_COMMIT: "deadbeef"
211214
TEST_LDFLAGS: >
212215
-ldflags '-X github.com/arduino/arduino-cli/version.versionString={{.TEST_VERSIONSTRING}}
213216
-X github.com/arduino/arduino-cli/version.commit={{.TEST_COMMIT}}'
217+
-X github.com/arduino/arduino-cli/version.date={{.TIMESTAMP}}'
214218
# check-lint vars
215219
GOLINTBIN:
216220
sh: go list -f {{"{{"}}".Target{{"}}"}}" golang.org/x/lint/golint

Diff for: version/version.go

+4-1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ var (
2424
versionString = ""
2525
commit = ""
2626
status = "alpha"
27+
date = ""
2728
)
2829

2930
// Info FIXMEDOC
@@ -32,6 +33,7 @@ type Info struct {
3233
VersionString string `json:"VersionString"`
3334
Commit string `json:"Commit"`
3435
Status string `json:"Status"`
36+
Date string `json:"Date"`
3537
}
3638

3739
// NewInfo FIXMEDOC
@@ -41,11 +43,12 @@ func NewInfo(application string) *Info {
4143
VersionString: versionString,
4244
Commit: commit,
4345
Status: status,
46+
Date: date,
4447
}
4548
}
4649

4750
func (i *Info) String() string {
48-
return fmt.Sprintf("%s %s Version: %s Commit: %s", i.Application, i.Status, i.VersionString, i.Commit)
51+
return fmt.Sprintf("%s %s Version: %s Commit: %s Date: %s", i.Application, i.Status, i.VersionString, i.Commit, i.Date)
4952
}
5053

5154
//nolint:gochecknoinits

0 commit comments

Comments
 (0)