Skip to content

Add build datetime to version command output #1089

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 2, 2020
Merged

Add build datetime to version command output #1089

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 20 additions & 5 deletions .goreleaser.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,10 @@ builds:
goarch:
- amd64
ldflags:
- -s -w -X github.com/arduino/arduino-cli/version.versionString={{.Tag}} -X github.com/arduino/arduino-cli/version.commit={{ .ShortCommit }}
- -s -w
- -X github.com/arduino/arduino-cli/version.versionString={{.Tag}}
- -X github.com/arduino/arduino-cli/version.commit={{ .ShortCommit }}
- -X github.com/arduino/arduino-cli/version.date={{.Date}}
- # ARM
id: arduino_cli_arm
binary: arduino-cli
Expand All @@ -45,7 +48,10 @@ builds:
goarm:
- 6
ldflags:
- -s -w -X github.com/arduino/arduino-cli/version.versionString={{.Tag}} -X github.com/arduino/arduino-cli/version.commit={{ .ShortCommit }}
- -s -w
- -X github.com/arduino/arduino-cli/version.versionString={{.Tag}}
- -X github.com/arduino/arduino-cli/version.commit={{ .ShortCommit }}
- -X github.com/arduino/arduino-cli/version.date={{.Date}}
- "-extldflags '-static'"
- # ARMv7
id: arduino_cli_armv7
Expand All @@ -60,7 +66,10 @@ builds:
goarm:
- 7
ldflags:
- -s -w -X github.com/arduino/arduino-cli/version.versionString={{.Tag}} -X github.com/arduino/arduino-cli/version.commit={{ .ShortCommit }}
- -s -w
- -X github.com/arduino/arduino-cli/version.versionString={{.Tag}}
- -X github.com/arduino/arduino-cli/version.commit={{ .ShortCommit }}
- -X github.com/arduino/arduino-cli/version.date={{.Date}}
- "-extldflags '-static'"
- # ARM64
id: arduino_cli_arm64
Expand All @@ -73,7 +82,10 @@ builds:
goarch:
- arm64
ldflags:
- -s -w -X github.com/arduino/arduino-cli/version.versionString={{.Tag}} -X github.com/arduino/arduino-cli/version.commit={{ .ShortCommit }}
- -s -w
- -X github.com/arduino/arduino-cli/version.versionString={{.Tag}}
- -X github.com/arduino/arduino-cli/version.commit={{ .ShortCommit }}
- -X github.com/arduino/arduino-cli/version.date={{.Date}}
- "-extldflags '-static'"
- # All the other platforms
id: arduino_cli
Expand All @@ -87,7 +99,10 @@ builds:
- amd64
- 386
ldflags:
- -s -w -X github.com/arduino/arduino-cli/version.versionString={{.Tag}} -X github.com/arduino/arduino-cli/version.commit={{ .ShortCommit }}
- -s -w
- -X github.com/arduino/arduino-cli/version.versionString={{.Tag}}
- -X github.com/arduino/arduino-cli/version.commit={{ .ShortCommit }}
- -X github.com/arduino/arduino-cli/version.date={{.Date}}
- "-extldflags '-static'"

archives:
Expand Down
8 changes: 6 additions & 2 deletions Taskfile.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,15 +202,19 @@ vars:
# build vars
COMMIT:
sh: echo ${TRAVIS_COMMIT:-`git log -n 1 --format=%h`}
TIMESTAMP:
sh: echo "$(date -u +"%Y-%m-%dT%H:%M:%SZ")"
LDFLAGS: >
-ldflags '-X github.com/arduino/arduino-cli/version.commit={{.COMMIT}}'
-ldflags '-X github.com/arduino/arduino-cli/version.commit={{.COMMIT}}
-X github.com/arduino/arduino-cli/version.date={{.TIMESTAMP}}'
# test vars
GOFLAGS: "-timeout 10m -v -coverpkg=./... -covermode=atomic"
TEST_VERSIONSTRING: "0.0.0-test.preview"
TEST_COMMIT: "deadbeef"
TEST_LDFLAGS: >
-ldflags '-X github.com/arduino/arduino-cli/version.versionString={{.TEST_VERSIONSTRING}}
-X github.com/arduino/arduino-cli/version.commit={{.TEST_COMMIT}}'
-X github.com/arduino/arduino-cli/version.commit={{.TEST_COMMIT}}
-X github.com/arduino/arduino-cli/version.date={{.TIMESTAMP}}'
# check-lint vars
GOLINTBIN:
sh: go list -f {{"{{"}}".Target{{"}}"}}" golang.org/x/lint/golint
Expand Down
5 changes: 4 additions & 1 deletion version/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ var (
versionString = ""
commit = ""
status = "alpha"
date = ""
)

// Info FIXMEDOC
Expand All @@ -32,6 +33,7 @@ type Info struct {
VersionString string `json:"VersionString"`
Commit string `json:"Commit"`
Status string `json:"Status"`
Date string `json:"Date"`
}

// NewInfo FIXMEDOC
Expand All @@ -41,11 +43,12 @@ func NewInfo(application string) *Info {
VersionString: versionString,
Commit: commit,
Status: status,
Date: date,
}
}

func (i *Info) String() string {
return fmt.Sprintf("%s %s Version: %s Commit: %s", i.Application, i.Status, i.VersionString, i.Commit)
return fmt.Sprintf("%s %s Version: %s Commit: %s Date: %s", i.Application, i.Status, i.VersionString, i.Commit, i.Date)
}

//nolint:gochecknoinits
Expand Down