Backport #5830 : Include Go toolchain to --version (#5832)

sapk · techknowlogick · commit f28e17473c98 · 2019-01-24T10:33:28.000-05:00
* Include Go version

* fix import order
diff --git a/main.go b/main.go
@@ -8,6 +8,7 @@ package main // import "code.gitea.io/gitea"
 
 import (
 	"os"
+	"runtime"
 	"strings"
 
 	"code.gitea.io/gitea/cmd"
@@ -61,8 +62,8 @@ arguments - which can alternatively be run by running the subcommand web.`
 
 func formatBuiltWith(Tags string) string {
 	if len(Tags) == 0 {
-		return ""
+		return " built with " + runtime.Version()
 	}
 
-	return " built with: " + strings.Replace(Tags, " ", ", ", -1)
+	return " built with " + runtime.Version() + " : " + strings.Replace(Tags, " ", ", ", -1)
 }

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ package main // import "code.gitea.io/gitea"`
`8`	`8`
`9`	`9`	`import (`
`10`	`10`	`"os"`
	`11`	`+ "runtime"`
`11`	`12`	`"strings"`
`12`	`13`
`13`	`14`	`"code.gitea.io/gitea/cmd"`
@@ -61,8 +62,8 @@ arguments - which can alternatively be run by running the subcommand web.`
`61`	`62`
`62`	`63`	`func formatBuiltWith(Tags string) string {`
`63`	`64`	`if len(Tags) == 0 {`
`64`		`- return ""`
	`65`	`+ return " built with " + runtime.Version()`
`65`	`66`	`}`
`66`	`67`
`67`		`- return " built with: " + strings.Replace(Tags, " ", ", ", -1)`
	`68`	`+ return " built with " + runtime.Version() + " : " + strings.Replace(Tags, " ", ", ", -1)`
`68`	`69`	`}`