From bb9fc876c165a6f152b9f113460cec2d31de0c55 Mon Sep 17 00:00:00 2001 From: "Lukas Rieger (Blue)" Date: Wed, 11 Dec 2024 00:05:41 +0100 Subject: [PATCH] Fix branch could be empty --- api | 2 +- buildSrc/src/main/kotlin/versioning.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api b/api index 67a7352c6..5dc74e299 160000 --- a/api +++ b/api @@ -1 +1 @@ -Subproject commit 67a7352c672d054b9e6cd0e996a4fa92ba0c237e +Subproject commit 5dc74e299c5553627d33e0ad734f992c01bf2141 diff --git a/buildSrc/src/main/kotlin/versioning.kt b/buildSrc/src/main/kotlin/versioning.kt index 3704bfc21..51f852236 100644 --- a/buildSrc/src/main/kotlin/versioning.kt +++ b/buildSrc/src/main/kotlin/versioning.kt @@ -17,7 +17,7 @@ fun Project.gitVersion(): String { val commits = runCommand("git rev-list --count $lastTag..HEAD", "0") val branch = runCommand("git branch --show-current", "master") val gitVersion = lastVersion + - (if (branch == "master") "" else "-${branch.replace('/', '.')}") + + (if (branch == "master" || branch.isEmpty()) "" else "-${branch.replace('/', '.')}") + (if (commits == "0") "" else "-$commits") + (if (gitClean()) "" else "-dirty")