franklinblanco
/
yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

android: Fix regex for git version

This commit is contained in:
t895 2024-02-08 14:24:15 -05:00
parent f049453dd6
commit 0a1283f94f
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/android/app/build.gradle.kts
View File

@ -259,13 +259,20 @@ fun runGitCommand(command: List<String>): String {
} }
fun getGitVersion(): String { fun getGitVersion(): String {
val gitVersion = runGitCommand(listOf("git", "describe", "--always", "--long")) val gitVersion = runGitCommand(
listOf(
"git",
"describe",
"--always",
"--long"
)
).replace(Regex("(-0)?-[^-]+$"), "")
val versionName = if (System.getenv("GITHUB_ACTIONS") != null) { val versionName = if (System.getenv("GITHUB_ACTIONS") != null) {
System.getenv("GIT_TAG_NAME") ?: gitVersion System.getenv("GIT_TAG_NAME") ?: gitVersion
} else { } else {
gitVersion gitVersion
} }
return versionName.replace(Regex("(-0)?-[^-]+$"), "").ifEmpty { "0.0" } return versionName.ifEmpty { "0.0" }
} }
fun getGitHash(): String = fun getGitHash(): String =