From b0d3f25347c8e092cf7bd10292dadd981685549f Mon Sep 17 00:00:00 2001
From: alexcrea <42614139+alexcrea@users.noreply.github.com>
Date: Sat, 14 Jun 2025 12:33:29 +0200
Subject: [PATCH] move dependency submission & correct upload of jars

---
 .github/workflows/gradle.yml | 100 ++++++++++++++++-------------------
 1 file changed, 46 insertions(+), 54 deletions(-)

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 44c0fc7..902cc2b 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -25,65 +25,57 @@ jobs:
       contents: read
 
     steps:
-    - uses: actions/checkout@v4
-    - name: Set up JDKs
-      uses: actions/setup-java@v4
-      with:
-        java-version: |
+      - uses: actions/checkout@v4
+      - name: Set up JDKs
+        uses: actions/setup-java@v4
+        with:
+          java-version: |
             16
             17
             20
             21
-        distribution: 'temurin'
-        cache: 'gradle'
+          distribution: 'temurin'
+          cache: 'gradle'
 
-    # Configure Gradle for optimal use in GitHub Actions, including caching of downloaded dependencies.
-    # See: https://github.com/gradle/actions/blob/main/setup-gradle/README.md
-    - name: Setup Gradle
-      uses: gradle/actions/setup-gradle@af1da67850ed9a4cedd57bfd976089dd991e2582 # v4.0.0
+      # Configure Gradle for optimal use in GitHub Actions, including caching of downloaded dependencies.
+      # See: https://github.com/gradle/actions/blob/main/setup-gradle/README.md
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@af1da67850ed9a4cedd57bfd976089dd991e2582 # v4.0.0
 
-    - name: Make gradlew executable
-      run: chmod +x ./gradlew
-    - name: Build with Gradle Wrapper
-      run: ./gradlew build --parallel
+      - name: Make gradlew executable
+        run: chmod +x ./gradlew
+      - name: Build with Gradle Wrapper
+        run: ./gradlew build --parallel
 
-    # Get the names of the online and offline jars
-    - name: Get file name for online JAR of CustomAnvil # grep -v "offline" to exclude offline jar
-      run: |
-        ONLINE_JAR_NAME=$(ls build/libs/CustomAnvil-*.jar | grep -v "offline") 
-        echo "online_jar_name=${ONLINE_JAR_NAME}" >> $GITHUB_ENV
-
-    - name: Get file name for offline JAR of CustomAnvil
-      run: |
-        OFFLINE_JAR_NAME=$(ls build/libs/CustomAnvil-*-offline.jar)
-        echo "offline_jar_name=${OFFLINE_JAR_NAME}" >> $GITHUB_ENV
-
-    # upload the named jars
-    - name: Upload online JAR artifact
-      uses: actions/upload-artifact@v4
-      with:
-        name: ${{ env.online_jar_name }}
-        path: build/libs/${{ env.online_jar_name }}
-
-    - name: Upload offline JAR file
-      uses: actions/upload-artifact@v4
-      with:
-        name: ${{ env.online_jar_name }}
-        path: build/libs/${{ env.online_jar_name }}
-
-    # Finally, upload test result
-    - name: Summarize tests results
-      uses: jeantessier/test-summary-action@v1
-      if: ${{ always() }}
-
-  dependency-submission:
-    needs: build
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-
-    steps:
-      # Generates and submits a dependency graph, enabling Dependabot Alerts for all project dependencies.
-      # See: https://github.com/gradle/actions/blob/main/dependency-submission/README.md
+      # only submit dependency on push
       - name: Generate and submit dependency graph
-        uses: gradle/actions/dependency-submission@af1da67850ed9a4cedd57bfd976089dd991e2582 # v4.0.0
+        uses: gradle/actions/dependency-submission@v4
+        #if: ${{ github.event_name == 'push' && success() }} #temporarly disabled for test
+        continue-on-error: true
+
+      # Get the names of the online and offline jars
+      # grep -v "offline" to exclude offline jar as the regex would catch it otherwise
+      - name: Get file name for jars
+        run: |
+          ONLINE_JAR_PATH=$(ls build/libs/CustomAnvil-*.jar | grep -v "offline") 
+          OFFLINE_JAR_PATH=$(ls build/libs/CustomAnvil-*-offline.jar)
+          
+          echo "online_jar_name=$(basename $ONLINE_JAR_PATH)" >> $GITHUB_ENV
+          echo "offline_jar_name=$(basename $OFFLINE_JAR_PATH)" >> $GITHUB_ENV
+
+      # upload the named jars
+      - name: Upload online JAR artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ env.online_jar_name }}
+          path: build/libs/${{ env.online_jar_name }}
+
+      - name: Upload offline JAR file
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ env.online_jar_name }}
+          path: build/libs/${{ env.online_jar_name }}
+
+      - name: Summarize tests results
+        uses: jeantessier/test-summary-action@v1
+        if: ${{ always() }}
\ No newline at end of file