jaredallard/rmfakecloud-proxy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update generate/versioninfo.go

Browse source
This commit is contained in:
Jiayu Yi 2018-08-18 21:56:10 +08:00
parent 5b1c71e51f
commit b3a11a5330
No known key found for this signature in database
GPG key ID: 84B60878E8AEAD6C
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
generate/versioninfo.go
View file

@ -13,7 +13,7 @@ import (
const Homepage = "https://github.com/yi-jiayu/secure" const Homepage = "https://github.com/yi-jiayu/secure"
var tmpl = template.Must(template.New("version.go").Parse(`//go:generate go run generate/versioninfo.go var tmpl = template.Must(template.New("version.go").Parse(`//go:generate go run generate/versioninfo.go
// Code generated by versioninfo.go; DO NOT EDIT. // Code generated by go generate; DO NOT EDIT.
package main package main
@ -30,10 +30,11 @@ type VersionInfo struct {
func main() { func main() {
describeCmd := exec.Command("git", "describe", "--tags", "--always") describeCmd := exec.Command("git", "describe", "--tags", "--always")
version, err := describeCmd.Output() output, err := describeCmd.Output()
if err != nil { if err != nil {
log.Fatal(fmt.Errorf("error describing commit: %v", err)) log.Fatal(fmt.Errorf("error describing commit: %v", err))
} }
version := strings.TrimSpace(string(output))
goos := os.Getenv("GOOS") goos := os.Getenv("GOOS")
if goos == "" { if goos == "" {
@ -48,7 +49,7 @@ func main() {
goVersion := runtime.Version() goVersion := runtime.Version()
vi := VersionInfo{ vi := VersionInfo{
Version: strings.TrimSpace(string(version)), Version: version,
GOARCH: goarch, GOARCH: goarch,
GOOS: goos, GOOS: goos,
GoVersion: goVersion, GoVersion: goVersion,

2
version.go
View file

@ -1,5 +1,5 @@
//go:generate go run generate/versioninfo.go //go:generate go run generate/versioninfo.go
// Code generated by versioninfo.go; DO NOT EDIT. // Code generated by go generate; DO NOT EDIT.
package main package main