From aba9b830bff294bfa1506f34b55045e7139d41cc Mon Sep 17 00:00:00 2001
From: ShintoKosei <2081384668@qq.com>
Date: Sun, 14 Apr 2024 10:58:37 +0800
Subject: [PATCH] update ci

---
 .github/workflows/build_1_20_4_v2.yml | 11 ++++-------
 scripts/PushToAPI.sh                  |  3 ---
 scripts/SetENV.sh                     |  3 +++
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build_1_20_4_v2.yml b/.github/workflows/build_1_20_4_v2.yml
index f9c4cf5..725341c 100644
--- a/.github/workflows/build_1_20_4_v2.yml
+++ b/.github/workflows/build_1_20_4_v2.yml
@@ -19,6 +19,8 @@ jobs:
         uses: gradle/actions/wrapper-validation@v3
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v3
+        with:
+          gradle-version: 8.4
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
@@ -27,13 +29,9 @@ jobs:
       - name: Configure Git User Details
         run: git config --global user.email "ci@luminolmc.com" && git config --global user.name "LuminolMC CI"
       - name: Apply Patches
-        uses: gradle/actions/setup-gradle@v3
-        with:
-          arguments: applyPatches
+        run: gradle applyPatches
       - name: CreateJar
-        uses: gradle/actions/setup-gradle@v3
-        with:
-          arguments: createReobfBundlerJar createReobfPaperclipJar
+        run: gradle createReobfBundlerJar createReobfPaperclipJar
       - name: SetENV
         run: |
           sh scripts/SetENV.sh
@@ -50,7 +48,6 @@ jobs:
           tag: ${{ env.tag }}
           name: ${{ env.project_id_b }} ${{ env.mcversion }} - ${{ env.commit_id }}
           body: |
-            ====
             📦Version: `${{ env.mcversion }}` | Commit ${{ env.commit_id }} [![download](https://img.shields.io/github/downloads/LuminolMC/${{ env.project_id }}/${{ env.tag }}/total?color=0)](https://github.com/LuminolMC/${{ env.project_id }}/download/${{ env.tag }}/${{ env.jar }})
             This release is automatically compiled by GitHub Actions
             ### Commit Message
diff --git a/scripts/PushToAPI.sh b/scripts/PushToAPI.sh
index 6c7b61a..332c0aa 100644
--- a/scripts/PushToAPI.sh
+++ b/scripts/PushToAPI.sh
@@ -22,9 +22,6 @@ jar_name="$pro_id_mcv-paperclip.jar"
 ctime=$(date -u +"%s")"000"
 
 # v2
-# v2
-echo "Authentication: $secret_v2"
-#echo "{\"version_group\":\"$mcversion_group\",\"channel\":\"$channel\",\"changes\":\"$changes\",\"jar_name\":\"$jar_name\",\"sha256\":\"$jar_sha256\",\"release_tag\":\"$tag\",\"time\":\"$ctime\"}" > data.json
 json=$(printf "{\\\"channel\\\":\\\"%s\\\", \\\"jar_name\\\":\\\"%s\\\", \\\"sha256\\\":\\\"%s\\\", \\\"tag\\\":\\\"%s\\\", \\\"time\\\":\\\"%s\\\", \\\"changes\\\":\\\"%s\\\"}" \
     "$channel" "$jar_name" "$jar_sha256" "$tag" "$ctime" "$changes")
 echo "[DEBUG] $json"
diff --git a/scripts/SetENV.sh b/scripts/SetENV.sh
index 2a238d7..9972bd0 100644
--- a/scripts/SetENV.sh
+++ b/scripts/SetENV.sh
@@ -14,6 +14,9 @@ jarName="$project_id-$mcversion-paperclip.jar"
 jarName_dir="build/libs/$jarName"
 make_latest=$([ $preVersion = "true" ] && echo "false" || echo "true")
 
+ls build/libs
+echo "build/libs/$project_id-paperclip-$grdversion-reobf.jar >> build/libs/$jarName"
+echo "build/libs/$project_id-bundler-$grdversion-reobf.jar >> build/libs/$project_id-$mcversion-bundler.jar"
 mv build/libs/$project_id-paperclip-$grdversion-reobf.jar build/libs/$jarName
 mv build/libs/$project_id-bundler-$grdversion-reobf.jar build/libs/$project_id-$mcversion-bundler.jar