Always get the latest commit count for jar name (#763)

When adding commits or switching between branches the "shadowJar" gradle task always used the same (outdated) commit count which created jars with confusing names
This commit is contained in:
schroda
2023-11-06 03:16:55 +01:00
committed by GitHub
parent 7993da038e
commit b303291e94
2 changed files with 18 additions and 16 deletions

View File

@@ -14,18 +14,20 @@ val tachideskVersion = System.getenv("ProductVersion") ?: "v0.7.0"
val webUIRevisionTag = System.getenv("WebUIRevision") ?: "r983"
// counts commits on the master branch
val tachideskRevision = runCatching {
System.getenv("ProductRevision") ?: ProcessBuilder()
.command("git", "rev-list", "HEAD", "--count")
.start()
.let { process ->
process.waitFor()
val output = process.inputStream.use {
it.bufferedReader().use(BufferedReader::readText)
// counts commits on the current checked out branch
val getTachideskRevision = {
runCatching {
System.getenv("ProductRevision") ?: ProcessBuilder()
.command("git", "rev-list", "HEAD", "--count")
.start()
.let { process ->
process.waitFor()
val output = process.inputStream.use {
it.bufferedReader().use(BufferedReader::readText)
}
process.destroy()
"r" + output.trim()
}
process.destroy()
"r" + output.trim()
}
}.getOrDefault("r0")
}.getOrDefault("r0")
}