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

Make sure AppVersion is set without the -dirty suffix for non-dirty work trees regardless of where revel is run from.

Browse Source
This commit is contained in:
Roger Keller
2017-10-28 21:20:28 +02:00
parent f38fb6a15d
commit a2acbe32bf
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
harness/build.go
View File

@@ -39,7 +39,7 @@ func Build(buildFlags ...string) (app *App, compileError *revel.Error) {
// Add the db.import to the import paths. // Add the db.import to the import paths.
if dbImportPath, found := revel.Config.String("db.import"); found { if dbImportPath, found := revel.Config.String("db.import"); found {
sourceInfo.InitImportPaths = append(sourceInfo.InitImportPaths, strings.Split(dbImportPath,",")...) sourceInfo.InitImportPaths = append(sourceInfo.InitImportPaths, strings.Split(dbImportPath, ",")...)
} }
// Generate two source files. // Generate two source files.
@@ -210,7 +210,7 @@ func getAppVersion() string {
if (err != nil && os.IsNotExist(err)) || !info.IsDir() { if (err != nil && os.IsNotExist(err)) || !info.IsDir() {
return "" return ""
} }
gitCmd := exec.Command(gitPath, "--git-dir="+gitDir, "describe", "--always", "--dirty") gitCmd := exec.Command(gitPath, "--git-dir="+gitDir, "--work-tree="+revel.BasePath, "describe", "--always", "--dirty")
revel.RevelLog.Debug("Exec:", "args", gitCmd.Args) revel.RevelLog.Debug("Exec:", "args", gitCmd.Args)
output, err := gitCmd.Output() output, err := gitCmd.Output()