sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

version: fix tag parsing issues

Browse Source
This commit is contained in:
Kirill Vainer 2016-02-24 18:48:06 -05:00
parent 5935db5261
commit 3d8cbda240
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
version.gradle
View File

@ -67,7 +67,7 @@ def getReleaseInfo(String tag) {
} }
tag = tag.substring(1) tag = tag.substring(1)
String[] parts = tag.split("-"); String[] parts = tag.split("-", 2);
String mainVersion; String mainVersion;
boolean prerelease; boolean prerelease;
String releaseName = null; String releaseName = null;
@ -121,7 +121,13 @@ task configureVersionInfo {
jmeGitHash = head.id jmeGitHash = head.id
jmeShortGitHash = head.abbreviatedId jmeShortGitHash = head.abbreviatedId
jmeBranchName = grgit.branch.current.name jmeBranchName = grgit.branch.current.name
jmeGitTag = grgit.tag.list().find { it.commit == head } ?: System.env.TRAVIS_TAG jmeGitTag = grgit.tag.list().find { it.commit == head }
if (jmeGitTag != null) {
jmeGitTag = jmeGitTag.name
} else {
jmeGitTag = System.env.TRAVIS_TAG
}
def releaseInfo = getReleaseInfo(jmeGitTag) def releaseInfo = getReleaseInfo(jmeGitTag)
if (releaseInfo != null) { if (releaseInfo != null) {