Merge remote-tracking branch 'origin/1.18.2/main' into 1.18.2/main

.github/workflows/build1182.yml

@@ -0,0 +1,48 @@
+name: Build 1.18.2
+
+on:
+  push:
+    branches: 1.18.2/main
+  pull_request:
+    branches: 1.18.2/main
+  workflow_dispatch:
+env:
+  JAVA_VERSION: 17
+permissions:
+  contents: write
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check Environment Variables
+        run: env
+
+      - name: Checkout Repository
+        uses: actions/checkout@v3
+        with:
+          submodules: true
+
+      - name: Setup Java
+        uses: actions/setup-java@v2
+        with:
+          distribution: "temurin"
+          java-version: 17
+      - name: Make Gradle Wrapper Executable
+        if: ${{ runner.os != 'Windows' }}
+        run: chmod +x ./gradlew
+
+      - name: Build
+        run: ./gradlew clean build
+
+      - name: mergeJars
+        run: ./gradlew mergeJars
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: artifact
+          path: |
+            ./Merged/*
+            ./common/build/libs/*
+            ./fabric/build/libs/*
+            ./forge/build/libs/*

build.gradle

@@ -11,7 +11,7 @@ architectury {
 
 forgix {
     group = "com.github.guyapooye.clockworkadditions"
-    mergedJarName = "ClockworkAdditions-${mod_version}-forge-and-fabric.jar"
+    mergedJarName = "ClockworkAdditions-${mod_version}-${"git rev-parse HEAD".execute().text.trim().substring(0, 10)}-forge-and-fabric.jar"
 }
 
 subprojects {
@@ -68,4 +68,4 @@ allprojects {
     java {
         withSourcesJar()
     }
-}
+}