totole/revel-cmd
1
0
Fork 0
mirror of https://github.com/kevin-DL/revel-cmd.git synced 2026-01-11 18:54:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #86 from tw4452852/version

Browse Source 
fix version check against devel
This commit is contained in:
notzippy
2017-04-21 08:55:01 -07:00
committed by GitHub
parent ce84b78204 19ca52182d
commit d68b27ae81
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
harness/build.go
View File

@@ -88,8 +88,9 @@ func Build(buildFlags ...string) (app *App, compileError *revel.Error) {
revel.ImportPath, appVersion, revel.ImportPath, buildTime) revel.ImportPath, appVersion, revel.ImportPath, buildTime)
// TODO remove version check for versionLinkerFlags after Revel becomes Go min version to go1.5 // TODO remove version check for versionLinkerFlags after Revel becomes Go min version to go1.5
goVersion, _ := strconv.ParseFloat(runtime.Version()[2:5], 64) goVersion, err := strconv.ParseFloat(runtime.Version()[2:5], 64)
if goVersion < 1.5 { // runtime.Version() may return commit hash, we assume it is above 1.5
if goVersion < 1.5 && err == nil {
versionLinkerFlags = fmt.Sprintf("-X %s/app.AppVersion \"%s\" -X %s/app.BuildTime \"%s\"", versionLinkerFlags = fmt.Sprintf("-X %s/app.AppVersion \"%s\" -X %s/app.BuildTime \"%s\"",
revel.ImportPath, appVersion, revel.ImportPath, buildTime) revel.ImportPath, appVersion, revel.ImportPath, buildTime)
} }