From 0d775f1252cb1bba579a83cd8d865c1afb992ed9 Mon Sep 17 00:00:00 2001
From: moonleay <contact@moonleay.net>
Date: Wed, 8 May 2024 01:07:12 +0200
Subject: [PATCH] ci: added git commit short reference

Signed-off-by: moonleay <contact@moonleay.net>
---
 .forgejo/workflows/build-dev.yml | 15 +++++++++++++++
 build.gradle.kts                 |  6 +++---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/.forgejo/workflows/build-dev.yml b/.forgejo/workflows/build-dev.yml
index 0b69732..3cbc8ec 100644
--- a/.forgejo/workflows/build-dev.yml
+++ b/.forgejo/workflows/build-dev.yml
@@ -8,6 +8,13 @@ jobs:
       - uses: actions/checkout@v3
         name: Checkout
 
+      - name: Set short git commit reference
+        id: vars
+        run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
+
+      - name: Check outputs
+        run: echo
+
       - uses: https://github.com/actions/setup-java@v4
         name: Setup Java
         with:
@@ -16,18 +23,26 @@ jobs:
 
       - uses: https://github.com/gradle/actions/setup-gradle@v3
         name: Setup Gradle
+        env:
+          GIT_SHA_SHORT: ${{ steps.vars.outputs.sha_short }}
 
       - run: ./gradlew runDatagen
         name: Generate assets
+        env:
+          GIT_SHA_SHORT: ${{ steps.vars.outputs.sha_short }}
 
       - run: ./gradlew build
         name: Build project
+        env:
+          GIT_SHA_SHORT: ${{ steps.vars.outputs.sha_short }}
 
       - run: ./gradlew publish
         name: Upload
         env:
+          GIT_SHA_SHORT: ${{ steps.vars.outputs.sha_short }}
           PACKAGE_REPO_KEY: ${{ secrets.PACKAGE_REPO_KEY }}
       - run: ./gradlew modrinth
         name: Publish to Modrinth
         env:
+          GIT_SHA_SHORT: ${{ steps.vars.outputs.sha_short }}
           MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
diff --git a/build.gradle.kts b/build.gradle.kts
index 0f23974..2af2c37 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -30,9 +30,9 @@ plugins {
     id("com.modrinth.minotaur") version "2.+"
 }
 
-val mavenVersion = System.getenv("GITHUB_SHA") ?: System.getenv("GITHUB_SHA")
-    ?.let { "$it-${project.ext["minecraft.version"] as String}" }
-?: "0.0.0-${project.ext["minecraft.version"] as String}"
+val ver = System.getenv("GIT_SHA_SHORT") ?: "0.0.0"
+
+val mavenVersion = "$ver-${project.ext["minecraft.version"] as String}"
 val modId: String by project
 val modName: String by project