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

build: remove “git …”.execute() to retrieve git tag.

Browse Source
This commit is contained in:
David Bernard 2016-02-24 22:46:47 +01:00
parent 8e866561b8
commit c0af575487
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
version.gradle
View File

@ -116,13 +116,12 @@ def getReleaseInfo(String tag) {
task configureVersionInfo { task configureVersionInfo {
try { try {
def grgit = Grgit.open(project.file('.')) def grgit = Grgit.open(project.file('.'))
jmeRevision = grgit.log(includes:['HEAD']).size() def head = grgit.head()
jmeGitHash = grgit.head().id jmeRevision = grgit.log(includes: [head]).size()
jmeShortGitHash = grgit.head().abbreviatedId jmeGitHash = head.id
jmeShortGitHash = head.abbreviatedId
jmeBranchName = grgit.branch.current.name jmeBranchName = grgit.branch.current.name
//gtgit.describe doesn't behave like git describe and it doens't support any option jmeGitTag = grgit.tag.list().find { it.commit == head } ?: System.env.TRAVIS_TAG
//jmeGitTag = grgit.describe() ?: System.env.TRAVIS_TAG
jmeGitTag = "git describe --tags --exact-match --dirty".execute().text.trim() ?: System.env.TRAVIS_TAG
def releaseInfo = getReleaseInfo(jmeGitTag) def releaseInfo = getReleaseInfo(jmeGitTag)
if (releaseInfo != null) { if (releaseInfo != null) {