Merge pull request #1250 from reicast/skmp/git-tags

Android: Use tags in `git describe`
This commit is contained in:
Stefanos Kornilios Mitsis Poiitidis 2018-08-03 00:43:19 +02:00 committed by GitHub
commit e352fb9e9d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions

View File

@ -44,6 +44,7 @@ install:
- test -z "$encrypted_c726d225a9d9_key" || mv debug.keystore ~/.android/debug.keystore
before_script:
script:
- git fetch --unshallow
- cd shell/android-studio
- export NUMBER_OF_PROCESSORS=2
- "./gradlew build"

View File

@ -9,7 +9,7 @@ def getVersionCode = { ->
def getVersionName = { ->
def stdout = new ByteArrayOutputStream()
exec {
commandLine 'git', 'describe', '--always'
commandLine 'git', 'describe', '--tags', '--always'
standardOutput = stdout
}
return stdout.toString().trim()