Skip to content

Commit 6c7ded9

Browse files
committed
Handle empty git revision with default value 'unknown'
1 parent 8b207ac commit 6c7ded9

File tree

3 files changed

+12
-3
lines changed

3 files changed

+12
-3
lines changed

build.gradle

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,11 @@ if (project.hasProperty("CustomReleaseVersion")) {
1717
version = project.property("CustomReleaseVersion").replaceFirst("^release/", "")
1818
} else {
1919
String gitRevision = "git rev-parse HEAD".execute().text.trim()
20+
if (gitRevision.isEmpty()) {
21+
gitRevision = 'unknown'
22+
}
2023

21-
version = mod_version + '+' + gitRevision.substring(0, 10)
24+
version = mod_version + '+' + (gitRevision.length() >= 10 ? gitRevision.substring(0, 10) : gitRevision)
2225
}
2326

2427
tasks.register("updateKelvin") {

fabric/build.gradle

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,11 @@ if (project.hasProperty("CustomReleaseVersion")) {
1818
version = project.property("CustomReleaseVersion").replaceFirst("^release/", "")
1919
} else {
2020
String gitRevision = "git rev-parse HEAD".execute().text.trim()
21+
if (gitRevision.isEmpty()) {
22+
gitRevision = 'unknown'
23+
}
2124

22-
version = minecraft_version + '-'+ mod_version + '-' + "fabric" + '-' + gitRevision.substring(0, 10)
25+
version = minecraft_version + '-'+ mod_version + '-' + "fabric" + '-' + (gitRevision.length() >= 10 ? gitRevision.substring(0, 10) : gitRevision)
2326
}
2427

2528
configurations {

forge/build.gradle

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,11 @@ if (project.hasProperty("CustomReleaseVersion")) {
2222
version = project.property("CustomReleaseVersion").replaceFirst("^release/", "")
2323
} else {
2424
String gitRevision = "git rev-parse HEAD".execute().text.trim()
25+
if (gitRevision.isEmpty()) {
26+
gitRevision = 'unknown'
27+
}
2528

26-
version = minecraft_version + '-'+ mod_version + '-' + "forge" + '-' + gitRevision.substring(0, 10)
29+
version = minecraft_version + '-'+ mod_version + '-' + "forge" + '-' + (gitRevision.length() >= 10 ? gitRevision.substring(0, 10) : gitRevision)
2730
}
2831

2932
architectury {

0 commit comments

Comments
 (0)