Merge branch '1.18.x/main' into 1.18.x/universal-joint

Author: PriestOfFern

.github/workflows/build-1.18.x.yml

@@ -1,37 +1,37 @@
-name: Build
-on:
-  push:
-    branches:
-      - '1.18.x/*'
-  pull_request:
-    types: [ opened, synchronize, reopened ]
-jobs:
-  validate-gradle:
-    name: "Validate Gradle wrapper"
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          submodules: true # Clone with vs-core submodule
-      - uses: gradle/wrapper-validation-action@v1
-
-  test-server:
-    name: Test Server
-    strategy:
-      matrix:
-        serverType: [ 'fabric', 'forge' ]
-    runs-on: ubuntu-latest
-    timeout-minutes: 20 # Fail after 20 minutes
-    steps:
-      - name: Shallow Clone (--recurse-submodules)
-        uses: actions/checkout@v2
-        with:
-          submodules: recursive
-
-      - name: Setup Gradle & Caches
-        uses: "./.github/actions/setup-gradle"
-
-      - name: Test Server
-        uses: ValkyrienSkies/Minecraft-Architectury-Testing@v1.9
-        with:
-          serverType: ${{ matrix.serverType }}
+# name: Build
+# on:
+#   push:
+#     branches:
+#       - '1.18.x/*'
+#   pull_request:
+#     types: [ opened, synchronize, reopened ]
+# jobs:
+#   validate-gradle:
+#     name: "Validate Gradle wrapper"
+#     runs-on: ubuntu-latest
+#     steps:
+#       - uses: actions/checkout@v2
+#         with:
+#           submodules: true # Clone with vs-core submodule
+#       - uses: gradle/wrapper-validation-action@v1
+# 
+#   test-server:
+#     name: Test Server
+#     strategy:
+#       matrix:
+#         serverType: [ 'fabric', 'forge' ]
+#     runs-on: ubuntu-latest
+#     timeout-minutes: 20 # Fail after 20 minutes
+#     steps:
+#       - name: Shallow Clone (--recurse-submodules)
+#         uses: actions/checkout@v2
+#         with:
+#           submodules: recursive
+# 
+#       - name: Setup Gradle & Caches
+#         uses: "./.github/actions/setup-gradle"
+# 
+#       - name: Test Server
+#         uses: ValkyrienSkies/Minecraft-Architectury-Testing@v1.9
+#         with:
+#           serverType: ${{ matrix.serverType }}

build.gradle

@@ -17,8 +17,11 @@ if (project.hasProperty("CustomReleaseVersion")) {
     version = project.property("CustomReleaseVersion").replaceFirst("^release/", "")
 } else {
     String gitRevision = "git rev-parse HEAD".execute().text.trim()
+    if (gitRevision.isEmpty()) {
+        gitRevision = 'unknown'
+    }
 
-    version = mod_version + '+' + gitRevision.substring(0, 10)
+    version = mod_version + '+' + (gitRevision.length() >= 10 ? gitRevision.substring(0, 10) : gitRevision)
 }
 
 tasks.register("updateKelvin") {

fabric/build.gradle

@@ -18,8 +18,11 @@ if (project.hasProperty("CustomReleaseVersion")) {
     version = project.property("CustomReleaseVersion").replaceFirst("^release/", "")
 } else {
     String gitRevision = "git rev-parse HEAD".execute().text.trim()
+    if (gitRevision.isEmpty()) {
+        gitRevision = 'unknown'
+    }
 
-    version = minecraft_version + '-'+ mod_version + '-' + "fabric" + '-' + gitRevision.substring(0, 10)
+    version = minecraft_version + '-'+ mod_version + '-' + "fabric" + '-' + (gitRevision.length() >= 10 ? gitRevision.substring(0, 10) : gitRevision)
 }
 
 configurations {

forge/build.gradle

@@ -22,8 +22,11 @@ if (project.hasProperty("CustomReleaseVersion")) {
     version = project.property("CustomReleaseVersion").replaceFirst("^release/", "")
 } else {
     String gitRevision = "git rev-parse HEAD".execute().text.trim()
+    if (gitRevision.isEmpty()) {
+        gitRevision = 'unknown'
+    }
 
-    version = minecraft_version + '-'+ mod_version + '-' + "forge" + '-' + gitRevision.substring(0, 10)
+    version = minecraft_version + '-'+ mod_version + '-' + "forge" + '-' + (gitRevision.length() >= 10 ? gitRevision.substring(0, 10) : gitRevision)
 }
 
 architectury {