tstarr/yuzu
1
0
Fork 0
mirror of https://github.com/starr-dusT/yuzu-mainline synced 2024-03-05 21:12:25 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12963 from t895/versioning-fix

Browse Source 
android: Fix regex for git version
This commit is contained in:
liamwhite 2024-02-08 17:03:32 -05:00 committed by GitHub
commit 71e59bdcd8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
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 =