Browse Source

android: Fix regex for git version

nce_cpp
t895 2 years ago
parent
commit
95199610fd
  1. 11
      src/android/app/build.gradle.kts

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

@ -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 =

Loading…
Cancel
Save