Commit aa2cfbf

authored

Merge pull request #76 from arduino/per1234/version-timestamp

Add build timestamp to the --version output

2 parents 385b1e8 + c2aaa06 commit aa2cfbfCopy full SHA for aa2cfbf

File tree

+20

-5

lines changed

+20

-5

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -184,8 +184,10 @@ vars:`
`184`	`184`	`# build vars`
`185`	`185`	`COMMIT:`
`186`	`186`	`sh: echo "$(git log -n 1 --format=%h)"`
	`187`	`+ TIMESTAMP:`
	`188`	`+ sh: echo "$(date -u +"%Y-%m-%dT%H:%M:%SZ")"`
`187`	`189`	`LDFLAGS: >`
`188`		`- -ldflags '-X github.com/arduino/arduino-check/configuration.commit={{.COMMIT}}'`
	`190`	`+ -ldflags '-X github.com/arduino/arduino-check/configuration.commit={{.COMMIT}} -X github.com/arduino/arduino-check/configuration.buildTimestamp={{.TIMESTAMP}}'`
`189`	`191`	`GOFLAGS: "-timeout 10m -v -coverpkg=./... -covermode=atomic"`
`190`	`192`
`191`	`193`	`GOLINTFLAGS: "-min_confidence 0.8 -set_exit_status"`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ func Root() *cobra.Command {`
`39`	`39`	`rootCommand.PersistentFlags().String("project-type", "all", "Only check projects of the specified type and their subprojects. Can be {sketch\|library\|all}.")`
`40`	`40`	`rootCommand.PersistentFlags().Bool("recursive", true, "Search path recursively for Arduino projects to check. Can be {true\|false}.")`
`41`	`41`	`rootCommand.PersistentFlags().String("report-file", "", "Save a report on the checks to this file.")`
`42`		`- rootCommand.PersistentFlags().Bool("version", false, "Print version.")`
	`42`	`+ rootCommand.PersistentFlags().Bool("version", false, "Print version and timestamp of the build.")`
`43`	`43`
`44`	`44`	`return rootCommand`
`45`	`45`	`}`

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -39,12 +39,14 @@ func ArduinoCheck(rootCommand *cobra.Command, cliArguments []string) {`
`39`	`39`
`40`	`40`	`if configuration.VersionMode() {`
`41`	`41`	`if configuration.OutputFormat() == outputformat.Text {`
`42`		`- fmt.Println(configuration.Version())`
	`42`	`+ fmt.Println(configuration.Version()+" "+configuration.BuildTimestamp())`
`43`	`43`	`} else {`
`44`	`44`	`versionObject := struct {`
`45`		- Version string `json:"version"`
	`45`	+ Version string `json:"version"`
	`46`	+ BuildTimestamp string `json:"buildTimestamp"`
`46`	`47`	`}{`
`47`		`- Version: configuration.Version(),`
	`48`	`+ Version: configuration.Version(),`
	`49`	`+ BuildTimestamp: configuration.BuildTimestamp(),`
`48`	`50`	`}`
`49`	`51`	`versionJSON, err := json.MarshalIndent(versionObject, "", " ")`
`50`	`52`	`if err != nil {`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -193,6 +193,12 @@ func Version() string {`
`193`	`193`	`return version`
`194`	`194`	`}`
`195`	`195`
	`196`	`+var buildTimestamp string`
	`197`	`+`
	`198`	`+func BuildTimestamp() string {`
	`199`	`+ return buildTimestamp`
	`200`	`+}`
	`201`	`+`
`196`	`202`	`var targetPaths paths.PathList`
`197`	`203`
`198`	`204`	`// TargetPaths returns the projects search paths.`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -220,3 +220,8 @@ func TestVersion(t *testing.T) {`
`220`	`220`	`version = "42.1.2"`
`221`	`221`	`assert.Equal(t, version, Version())`
`222`	`222`	`}`
	`223`	`+`
	`224`	`+func TestBuildTimestamp(t *testing.T) {`
	`225`	`+ buildTimestamp = "2020年11月27日T04:05:19+00:00"`
	`226`	`+ assert.Equal(t, buildTimestamp, BuildTimestamp())`
	`227`	`+}`

Comments

(0)