Merge pull request #4168 from ZacSharp/pr/build/1.19.4/improvedVersio…

…nDetection Improve version detection
cabaletta · Oct 31, 2023 · ea964a9 · ea964a9
2 parents 1409c92 + 9accb2b
commit ea964a9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/.github/workflows/gradle_build.yml b/.github/workflows/gradle_build.yml
@@ -28,7 +28,7 @@ jobs:
       run: chmod +x gradlew
 
     - name: Build with Gradle
-      run: ./gradlew build -Pmod_version="$(git describe --always --tags | cut -c2-)"
+      run: ./gradlew build -Pmod_version="$(git describe --always --tags --first-parent | cut -c2-)"
 
     - name: Archive Artifacts
       uses: actions/upload-artifact@v3

diff --git a/build.gradle b/build.gradle
@@ -21,13 +21,18 @@ allprojects {
     apply plugin: "maven-publish"
 
     archivesBaseName = rootProject.archives_base_name
-    def vers = 'git describe --always --tags --dirty'.execute().text.trim()
+    def vers = ""
+    try {
+        vers = 'git describe --always --tags --first-parent --dirty'.execute().text.trim()
+    } catch (Exception e) {
+        println "Version detection failed: " + e
+    }
     if (!vers.startsWith("v")) {
-        println "git doesn't appear to be installed!"
         println "using version number: " + rootProject.mod_version
         version = rootProject.mod_version
     } else {
         version = vers.substring(1)
+        println "Detected version " + version
     }
     group = rootProject.maven_group