Skip to content

VERY experimental Nintendo Switch 2 emulator

C++

android: Fix regex for git version

t89595199610fd9f
diff --git a/src/android/app/build.gradle.kts b/src/android/app/build.gradle.kts
index d44bb4c74d..cb026211cc 100644
--- a/src/android/app/build.gradle.kts
+++ b/src/android/app/build.gradle.kts
@@ -259,13 +259,20 @@ fun runGitCommand(command: List<String>): 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) {
System.getenv("GIT_TAG_NAME") ?: gitVersion
} else {
gitVersion
}
- return versionName.replace(Regex("(-0)?-[^-]+$"), "").ifEmpty { "0.0" }
+ return versionName.ifEmpty { "0.0" }
}
fun getGitHash(): String =