From ec97ae49241f374aad81b2ef914ca213f2a0f18b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Wojtas?= <wojtas.michal90@gmail.com>
Date: Tue, 30 Dec 2025 01:39:13 +0100
Subject: [PATCH 1/9] Update GitHub Actions workflow to set build label for
 release and snapshot

---
 .github/workflows/gradle.yml | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index a7ef6708..312dd33a 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -35,8 +35,18 @@ jobs:
         uses: gradle/gradle-build-action@093dfe9d598ec5a42246855d09b49dc76803c005
         with:
           arguments: shadowJar
-      - name: Upload a Build Artifact
+      - name: Set build label (release vs snapshot)
+        run: |
+          if [ "${{ github.ref_name }}" = "master" ]; then
+            echo "BUILD_LABEL=Release" >> $GITHUB_ENV
+            echo "SNAPSHOT_SUFFIX=" >> $GITHUB_ENV
+          else
+            echo "BUILD_LABEL=Snapshot" >> $GITHUB_ENV
+            echo "SNAPSHOT_SUFFIX=- Snapshot" >> $GITHUB_ENV
+          fi
+
+      - name: Upload build artifact
         uses: actions/upload-artifact@v4
         with:
-          name: 'Successfully build EternalCombat'
+          name: EternalCombat ${{ github.ref_name }}${{ env.SNAPSHOT_SUFFIX }} ${{ github.run_number }}
           path: eternalcombat-plugin/build/libs/*.jar

From e527aa2de919c125041c544b1fc040e625aceb73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Wojtas?= <wojtas.michal90@gmail.com>
Date: Tue, 30 Dec 2025 01:48:19 +0100
Subject: [PATCH 2/9] Fix artifact containing not correct name info

---
 .github/workflows/gradle.yml | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 312dd33a..f3ef29dd 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -44,9 +44,20 @@ jobs:
             echo "BUILD_LABEL=Snapshot" >> $GITHUB_ENV
             echo "SNAPSHOT_SUFFIX=- Snapshot" >> $GITHUB_ENV
           fi
-
+      - name: Determine branch name
+        run: |
+          if [ "${{ github.event_name }}" = "pull_request" ]; then
+          BRANCH_NAME="${{ github.head_ref }}"
+          else
+          BRANCH_NAME="${{ github.ref_name }}"
+          fi
+          
+          # Sanitize branch name (replace / with -)
+          SAFE_BRANCH_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+          
+          echo "BRANCH_NAME=$SAFE_BRANCH_NAME" >> $GITHUB_ENV
       - name: Upload build artifact
         uses: actions/upload-artifact@v4
         with:
-          name: EternalCombat ${{ github.ref_name }}${{ env.SNAPSHOT_SUFFIX }} ${{ github.run_number }}
+          name: EternalCombat ${{ env.BRANCH_NAME }}${{ env.SNAPSHOT_SUFFIX }} ${{ github.run_number }}
           path: eternalcombat-plugin/build/libs/*.jar

From cbe468cd3e89104100cdd6d539e001bb36f48689 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Wojtas?= <wojtas.michal90@gmail.com>
Date: Tue, 30 Dec 2025 01:52:48 +0100
Subject: [PATCH 3/9] Adjust space

---
 .github/workflows/gradle.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index f3ef29dd..eb77ad58 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -59,5 +59,5 @@ jobs:
       - name: Upload build artifact
         uses: actions/upload-artifact@v4
         with:
-          name: EternalCombat ${{ env.BRANCH_NAME }}${{ env.SNAPSHOT_SUFFIX }} ${{ github.run_number }}
+          name: EternalCombat ${{ env.BRANCH_NAME }} ${{ env.SNAPSHOT_SUFFIX }} ${{ github.run_number }}
           path: eternalcombat-plugin/build/libs/*.jar

From 123b428e5601cf99c9590e00204ad782dca03a55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Wojtas?= <wojtas.michal90@gmail.com>
Date: Mon, 5 Jan 2026 22:33:24 +0100
Subject: [PATCH 4/9] Use sha in name as @Jakubk15 suggested

---
 .github/workflows/gradle.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index eb77ad58..10b45ed1 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -59,5 +59,5 @@ jobs:
       - name: Upload build artifact
         uses: actions/upload-artifact@v4
         with:
-          name: EternalCombat ${{ env.BRANCH_NAME }} ${{ env.SNAPSHOT_SUFFIX }} ${{ github.run_number }}
+          name: EternalCombat ${{ env.BRANCH_NAME }} ${{ env.SNAPSHOT_SUFFIX }}+${{ github.sha }}
           path: eternalcombat-plugin/build/libs/*.jar

From 6e2f3af0d6e22bde946441e75643f2e66dc850e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Wojtas?= <wojtas.michal90@gmail.com>
Date: Mon, 5 Jan 2026 22:41:53 +0100
Subject: [PATCH 5/9] Fix deprecation warnings

---
 .github/workflows/gradle.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 10b45ed1..49b51896 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -32,9 +32,8 @@ jobs:
       - name: Make gradlew executable
         run: chmod +x gradlew
       - name: Build with Gradle
-        uses: gradle/gradle-build-action@093dfe9d598ec5a42246855d09b49dc76803c005
-        with:
-          arguments: shadowJar
+        uses: gradle/actions/setup-gradle@6f229686ee4375cc4a86b2514c89bac4930e82c4
+        run: ./gradlew shadowJar
       - name: Set build label (release vs snapshot)
         run: |
           if [ "${{ github.ref_name }}" = "master" ]; then

From cb7cbf53db092b08e1bbff99aa709020201294a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Wojtas?= <wojtas.michal90@gmail.com>
Date: Mon, 5 Jan 2026 22:47:23 +0100
Subject: [PATCH 6/9] Fix ugly SHA

---
 .github/workflows/gradle.yml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 49b51896..0adcd366 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -55,8 +55,17 @@ jobs:
           SAFE_BRANCH_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
           
           echo "BRANCH_NAME=$SAFE_BRANCH_NAME" >> $GITHUB_ENV
+      - name: Set short commit SHA
+        run: |
+          if [ "${{ github.event_name }}" = "pull_request" ]; then
+            SHA="${{ github.event.pull_request.head.sha }}"
+          else
+            SHA="${{ github.sha }}"
+          fi
+
+          echo "SHORT_SHA=${SHA::7}" >> $GITHUB_ENV
       - name: Upload build artifact
         uses: actions/upload-artifact@v4
         with:
-          name: EternalCombat ${{ env.BRANCH_NAME }} ${{ env.SNAPSHOT_SUFFIX }}+${{ github.sha }}
+          name: EternalCombat ${{ env.BRANCH_NAME }} ${{ env.SNAPSHOT_SUFFIX }}+${{ env.SHORT_SHA }}
           path: eternalcombat-plugin/build/libs/*.jar

From 4b17e34d424f7129e8e30c31c576cfdbbbc282b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Wojtas?= <wojtas.michal90@gmail.com>
Date: Mon, 5 Jan 2026 22:49:33 +0100
Subject: [PATCH 7/9] Use gradle instead of gradlew made for gradleWrapper

---
 .github/workflows/gradle.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 0adcd366..08b209b9 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -33,7 +33,7 @@ jobs:
         run: chmod +x gradlew
       - name: Build with Gradle
         uses: gradle/actions/setup-gradle@6f229686ee4375cc4a86b2514c89bac4930e82c4
-        run: ./gradlew shadowJar
+        run: gradle shadowJar
       - name: Set build label (release vs snapshot)
         run: |
           if [ "${{ github.ref_name }}" = "master" ]; then

From fae67f6ff851064e56a4f8a8d326ae8cb0344125 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Wojtas?= <wojtas.michal90@gmail.com>
Date: Mon, 5 Jan 2026 22:51:06 +0100
Subject: [PATCH 8/9] run fix

---
 .github/workflows/gradle.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 08b209b9..0adcd366 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -33,7 +33,7 @@ jobs:
         run: chmod +x gradlew
       - name: Build with Gradle
         uses: gradle/actions/setup-gradle@6f229686ee4375cc4a86b2514c89bac4930e82c4
-        run: gradle shadowJar
+        run: ./gradlew shadowJar
       - name: Set build label (release vs snapshot)
         run: |
           if [ "${{ github.ref_name }}" = "master" ]; then

From 6bebd23741bcb39319d9ac1319bfebafae79a2ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Wojtas?= <wojtas.michal90@gmail.com>
Date: Mon, 5 Jan 2026 22:54:00 +0100
Subject: [PATCH 9/9] run fix v2

---
 .github/workflows/gradle.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 0adcd366..d44684c3 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -31,8 +31,11 @@ jobs:
           restore-keys: '${{ runner.os }}-gradle-'    
       - name: Make gradlew executable
         run: chmod +x gradlew
-      - name: Build with Gradle
+      - name: Setup Gradle
         uses: gradle/actions/setup-gradle@6f229686ee4375cc4a86b2514c89bac4930e82c4
+        with:
+          gradle-version: 8.4
+      - name: Build with Gradle
         run: ./gradlew shadowJar
       - name: Set build label (release vs snapshot)
         run: |