From 20f23e972696b6f2f3f0232c3bc84b59e7e749fa Mon Sep 17 00:00:00 2001
From: Klop233 <3337913379@qq.com>
Date: Sun, 14 Apr 2024 09:51:01 +0800
Subject: [PATCH 1/7] [ci skip] update CI

---
 .github/workflows/build_1_20_4_v2.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build_1_20_4_v2.yml b/.github/workflows/build_1_20_4_v2.yml
index 0d45a57..d8d2d7a 100644
--- a/.github/workflows/build_1_20_4_v2.yml
+++ b/.github/workflows/build_1_20_4_v2.yml
@@ -36,7 +36,7 @@ jobs:
         run: |
           mv build/libs/luminol-bundler-1.20.4-R0.1-SNAPSHOT-reobf.jar build/libs/luminol-1.20.4-bundler.jar
           mv build/libs/luminol-paperclip-1.20.4-R0.1-SNAPSHOT-reobf.jar build/libs/luminol-1.20.4-paperclip.jar
-      - name: setenv
+      - name: SetEnvironment
         run: |
           sh scripts/SetENV.sh
           echo "${{ env.tag }}"
@@ -56,7 +56,7 @@ jobs:
           prerelease: ${{ env.pre }}
           makeLatest: ${{ env.make_latest }}
           token: "${{ secrets.GITHUB_TOKEN }}"
-      - name: Push to Api
+      - name: Push to API
         if: "!contains(github.event.commits[0].message, '[release-skip]')"
         env:
           secret_v2: ${{ secrets.API_KEY }}

From 5056e7ecbcc728b40c007729cc6b1bc19c6b9d9d Mon Sep 17 00:00:00 2001
From: ShintoKosei <2081384668@qq.com>
Date: Sun, 14 Apr 2024 10:25:13 +0800
Subject: [PATCH 2/7] update ci

---
 .github/workflows/build_1_20_4_v2.yml | 59 +++++++++++++++------------
 scripts/PushToAPI.sh                  | 33 +++------------
 scripts/SetENV.sh                     | 22 +++++++---
 3 files changed, 55 insertions(+), 59 deletions(-)

diff --git a/.github/workflows/build_1_20_4_v2.yml b/.github/workflows/build_1_20_4_v2.yml
index d8d2d7a..5c45958 100644
--- a/.github/workflows/build_1_20_4_v2.yml
+++ b/.github/workflows/build_1_20_4_v2.yml
@@ -5,60 +5,67 @@ on:
       branches: [ "ver/1.20.4" ]
     pull_request:
       branches: [ "ver/1.20.4" ]
-    # workflow_dispatch:
+
 permissions: write-all
+
 jobs:
   build:
     runs-on: ubuntu-latest
     environment: default
-
     steps:
       - name: Checkout Git Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+      - name: Validate Gradle wrapper
+        uses: gradle/actions/wrapper-validation@v3
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v3
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '17'
-      - name: Setup Git Config
-        run: |
-          git config --global user.email "ci@luminolmc.com"
-          git config --global user.name "Luminol CI"
+      - name: Configure Git User Details
+        run: git config --global user.email "ci@luminolmc.com" && git config --global user.name "LuminolMC CI"
       - name: Apply Patches
-        run: ./gradlew applyPatches
-      - name: Build
-        run: ./gradlew createReobfBundlerJar createReobfPaperclipJar
-      - uses: "actions/upload-artifact@v3"
+        uses: gradle/actions/setup-gradle@v3
         with:
-          name: "Luminol CI Artifacts"
-          path: "build/libs/*.jar"
-      - name: Rename jar file
-        run: |
-          mv build/libs/luminol-bundler-1.20.4-R0.1-SNAPSHOT-reobf.jar build/libs/luminol-1.20.4-bundler.jar
-          mv build/libs/luminol-paperclip-1.20.4-R0.1-SNAPSHOT-reobf.jar build/libs/luminol-1.20.4-paperclip.jar
-      - name: SetEnvironment
+          arguments: applyPatches
+      - name: CreateJar
+        uses: gradle/actions/setup-gradle@v3
+        with:
+          arguments: createReobfBundlerJar createReobfPaperclipJar
+      - name: SetENV
         run: |
           sh scripts/SetENV.sh
           echo "${{ env.tag }}"
+      - name: Upload Artifact
+        uses: "actions/upload-artifact@v4"
+        with:
+          name: "${{ env.project_id_b }} CI Artifacts"
+          path: "build/libs/*.jar"
       - name: Create Release
-        if: "!contains(github.event.commits[0].message, '[release-skip]')"
-        uses: ncipollo/release-action@v1.12.0
+        if: "!contains(github.event.commits[0].message, '[release skip]')"
+        uses: ncipollo/release-action@v1.14.0
         with:
           tag: ${{ env.tag }}
           name: Luminol ${{ env.mcversion }} - ${{ env.commitid }}
           body: |
-           📦Version: `${{ env.mcversion }}` | Commit ${{ env.commitid }} [![download](https://img.shields.io/github/downloads/LuminolMC/Luminol/${{ env.tag }}/total?color=0)](https://github.com/LeavesMC/LuminolMC/Luminol/download/${{ env.tag }}/luminol-1.20.4-paperclip.jar)
+            ====
+            📦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
+            ${{ env.commit_msg }}
           artifacts: |
-            build/libs/luminol-1.20.4-bundler.jar
-            build/libs/luminol-1.20.4-paperclip.jar
+            ${{ env.jar_dir }}
+            build/libs/${{ env.project_id }}-${{ env.mcversion }}-bundler.jar
           generateReleaseNotes: true
           prerelease: ${{ env.pre }}
           makeLatest: ${{ env.make_latest }}
           token: "${{ secrets.GITHUB_TOKEN }}"
       - name: Push to API
-        if: "!contains(github.event.commits[0].message, '[release-skip]')"
+        if: "!contains(github.event.commits[0].message, '[release skip]')"
         env:
           secret_v2: ${{ secrets.API_KEY }}
           tag: ${{ env.tag }}
-        run: sh scripts/PushToAPI.sh
+          project_id: ${{ env.project_id }}
+        run: sh scripts/PushToAPI.sh
\ No newline at end of file
diff --git a/scripts/PushToAPI.sh b/scripts/PushToAPI.sh
index 0bfbd59..b5806e7 100644
--- a/scripts/PushToAPI.sh
+++ b/scripts/PushToAPI.sh
@@ -1,48 +1,25 @@
 sha256() {
   sha256sum $1 | awk '{print $1}'
 }
-
 prop() {
   grep "${1}" gradle.properties | cut -d'=' -f2 | sed 's/\r//'
 }
 
-project_id="luminol"
 mcversion_group=$(prop GroupMCV)
 mcversion=$(prop mcVersion)
 pre=$(prop preVersion)
+pro_id_mcv=$project_id-$mcversion
 
 if [ $pre = "true" ]; then
   channel="experimental"
 else
   channel="default"
 fi
+
 changes=$(git log -1 --pretty="[{\"commit\": \"%H\", \"message\": \"%s\", \"summary\": \"%s\"}]")
-jar_sha256=`sha256 build/libs/luminol-1.20.4-paperclip.jar`
-jar_name="luminol-1.20.4-paperclip.jar"
+jar_sha256=`sha256 build/libs/$pro_id_mcv-paperclip.jar`
+jar_name="$pro_id_mcv-paperclip.jar"
 ctime=$(date -u +"%s")"000"
 
 # 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"
-echo "[DEBUG] $changes"
-echo "[DEBUG] curl --location --request POST \"https://api.luminolmc.com/v2/projects/$project_id/$mcversion/build/commit\" \
-    -H \"Content-Type: application/x-www-form-urlencoded\" \
-    -H \"Authorization: $secret_v2\" \
-    --data-urlencode \"channel=$channel\" \
-    --data-urlencode \"jar_name=$jar_name\" \
-    --data-urlencode \"sha256=$jar_sha256\" \
-    --data-urlencode \"release_tag=$tag\" \
-    --data-urlencode \"time=$ctime\" \
-    --data-urlencode \"changes=$changes\""
-curl -L --request POST "https://api.luminolmc.com/v2/projects/$project_id/$mcversion/build/commit" \
-    -H "Content-Type: application/x-www-form-urlencoded" \
-    -H "Authorization: $secret_v2" \
-    --data-urlencode "channel=$channel" \
-    --data-urlencode "jar_name=$jar_name" \
-    --data-urlencode "sha256=$jar_sha256" \
-    --data-urlencode "release_tag=$tag" \
-    --data-urlencode "time=$ctime" \
-    --data-urlencode "changes=$changes"
+curl -L --request POST "https://api.luminolmc.com/v2/projects/$project_id/$mcversion/build/commit" -H "Content-Type: application/x-www-form-urlencoded" -H "Authorization: $secret_v2" --data-urlencode "channel=$channel" --data-urlencode "jar_name=$jar_name" --data-urlencode "sha256=$jar_sha256" --data-urlencode "release_tag=$tag" --data-urlencode "time=$ctime" --data-urlencode "changes=$changes"
\ No newline at end of file
diff --git a/scripts/SetENV.sh b/scripts/SetENV.sh
index 88f4caa..8ea7b03 100644
--- a/scripts/SetENV.sh
+++ b/scripts/SetENV.sh
@@ -2,17 +2,29 @@ prop() {
   grep "${1}" gradle.properties | cut -d'=' -f2 | sed 's/\r//'
 }
 
+$project_id="luminol"
+$project_id_b="Luminol"
+
 commitid=$(git log --pretty='%h' -1)
 mcversion=$(prop mcVersion)
+grdversion=$(prop version)
 preVersion=$(prop preVersion)
 release_tag="$mcversion-$commitid"
-jarName="build/libs/luminol-1.20.4-paperclip.jar"
+jarName="$project_id-$mcversion-paperclip.jar"
+jarName_dir="build/libs/$jarName"
 make_latest=$([ $preVersion = "true" ] && echo "false" || echo "true")
 
-echo "commitid=$commitid" >> $GITHUB_ENV
+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
+
+echo "project_id=$project_id" >> $GITHUB_ENV
+echo "project_id_b=$project_id_b" >> $GITHUB_ENV
+echo "commit_id=$commitid" >> $GITHUB_ENV
+echo "commit_msg=$(git log --pretty='> [%h] %s' -$number)" >> $GITHUB_ENV
+echo "$commit_msg"
 echo "mcversion=$mcversion" >> $GITHUB_ENV
-echo "$mcversion"
+echo "pre=$preVersion" >> $GITHUB_ENV
 echo "tag=$release_tag" >> $GITHUB_ENV
 echo "jar=$jarName" >> $GITHUB_ENV
-echo "pre=$preVersion" >> $GITHUB_ENV
-echo "make_latest=$make_latest" >> $GITHUB_ENV
+echo "jar_dir=$jarName_dir" >> $GITHUB_ENV
+echo "make_latest=$make_latest" >> $GITHUB_ENV
\ No newline at end of file

From 2fe54ceff9d126dd86b54cb95907c8623ae30a8b Mon Sep 17 00:00:00 2001
From: Klop233 <3337913379@qq.com>
Date: Sun, 14 Apr 2024 10:33:03 +0800
Subject: [PATCH 3/7] [ci skip] update CI

---
 scripts/PushToAPI.sh | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/scripts/PushToAPI.sh b/scripts/PushToAPI.sh
index b5806e7..6c7b61a 100644
--- a/scripts/PushToAPI.sh
+++ b/scripts/PushToAPI.sh
@@ -22,4 +22,28 @@ jar_name="$pro_id_mcv-paperclip.jar"
 ctime=$(date -u +"%s")"000"
 
 # v2
-curl -L --request POST "https://api.luminolmc.com/v2/projects/$project_id/$mcversion/build/commit" -H "Content-Type: application/x-www-form-urlencoded" -H "Authorization: $secret_v2" --data-urlencode "channel=$channel" --data-urlencode "jar_name=$jar_name" --data-urlencode "sha256=$jar_sha256" --data-urlencode "release_tag=$tag" --data-urlencode "time=$ctime" --data-urlencode "changes=$changes"
\ No newline at end of file
+# 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"
+echo "[DEBUG] $changes"
+echo "[DEBUG] curl --location --request POST \"https://api.luminolmc.com/v2/projects/$project_id/$mcversion/build/commit\" \
+    -H \"Content-Type: application/x-www-form-urlencoded\" \
+    -H \"Authorization: $secret_v2\" \
+    --data-urlencode \"channel=$channel\" \
+    --data-urlencode \"jar_name=$jar_name\" \
+    --data-urlencode \"sha256=$jar_sha256\" \
+    --data-urlencode \"release_tag=$tag\" \
+    --data-urlencode \"time=$ctime\" \
+    --data-urlencode \"changes=$changes\""
+curl -L --request POST "https://api.luminolmc.com/v2/projects/$project_id/$mcversion/build/commit" \
+    -H "Content-Type: application/x-www-form-urlencoded" \
+    -H "Authorization: $secret_v2" \
+    --data-urlencode "channel=$channel" \
+    --data-urlencode "jar_name=$jar_name" \
+    --data-urlencode "sha256=$jar_sha256" \
+    --data-urlencode "release_tag=$tag" \
+    --data-urlencode "time=$ctime" \
+    --data-urlencode "changes=$changes"
\ No newline at end of file

From aa391923f6d1c72d25990130c8c82dc087c7f0f8 Mon Sep 17 00:00:00 2001
From: ShintoKosei <2081384668@qq.com>
Date: Sun, 14 Apr 2024 10:33:27 +0800
Subject: [PATCH 4/7] update ci

---
 .github/workflows/build_1_20_4_v2.yml | 2 +-
 scripts/SetENV.sh                     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build_1_20_4_v2.yml b/.github/workflows/build_1_20_4_v2.yml
index 5c45958..f9c4cf5 100644
--- a/.github/workflows/build_1_20_4_v2.yml
+++ b/.github/workflows/build_1_20_4_v2.yml
@@ -48,7 +48,7 @@ jobs:
         uses: ncipollo/release-action@v1.14.0
         with:
           tag: ${{ env.tag }}
-          name: Luminol ${{ env.mcversion }} - ${{ env.commitid }}
+          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 }})
diff --git a/scripts/SetENV.sh b/scripts/SetENV.sh
index 8ea7b03..2a238d7 100644
--- a/scripts/SetENV.sh
+++ b/scripts/SetENV.sh
@@ -2,8 +2,8 @@ prop() {
   grep "${1}" gradle.properties | cut -d'=' -f2 | sed 's/\r//'
 }
 
-$project_id="luminol"
-$project_id_b="Luminol"
+project_id="luminol"
+project_id_b="Luminol"
 
 commitid=$(git log --pretty='%h' -1)
 mcversion=$(prop mcVersion)

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 5/7] 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
 

From 3250c80efa036765955fa4068d419c852c0e29e8 Mon Sep 17 00:00:00 2001
From: ShintoKosei <2081384668@qq.com>
Date: Sun, 14 Apr 2024 11:07:26 +0800
Subject: [PATCH 6/7] update ci

---
 gradle.properties | 6 +++---
 scripts/SetENV.sh | 6 ++----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 0dffdfc..0f0605d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -8,6 +8,6 @@ org.gradle.parallel = true
 org.gradle.vfs.watch = false
 org.gradle.jvmargs = -Xmx3G
 
-mcVersion=1.20.4
-GroupMCV=1.20
-preVersion=false
\ No newline at end of file
+mcVersion= 1.20.4
+GroupMCV= 1.20
+preVersion= false
\ No newline at end of file
diff --git a/scripts/SetENV.sh b/scripts/SetENV.sh
index 9972bd0..f94e852 100644
--- a/scripts/SetENV.sh
+++ b/scripts/SetENV.sh
@@ -1,5 +1,5 @@
 prop() {
-  grep "${1}" gradle.properties | cut -d'=' -f2 | sed 's/\r//'
+  grep "^[[:space:]]*${1}" gradle.properties | cut -d'=' -f2 | sed 's/^[[:space:]]*//; s/\r//'
 }
 
 project_id="luminol"
@@ -14,12 +14,10 @@ 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
 
+
 echo "project_id=$project_id" >> $GITHUB_ENV
 echo "project_id_b=$project_id_b" >> $GITHUB_ENV
 echo "commit_id=$commitid" >> $GITHUB_ENV

From a9a57793651e90696d55ef874f8a127c40f1944d Mon Sep 17 00:00:00 2001
From: Klop233 <3337913379@qq.com>
Date: Sun, 14 Apr 2024 09:51:01 +0800
Subject: [PATCH 7/7] fix ci*2

Add Gradle Scan

update ci

[ci skip] update CI
---
 .github/workflows/build_1_20_4_v2.yml | 4 ++--
 gradle.properties                     | 6 +++---
 scripts/SetENV.sh                     | 1 +
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build_1_20_4_v2.yml b/.github/workflows/build_1_20_4_v2.yml
index 725341c..7125444 100644
--- a/.github/workflows/build_1_20_4_v2.yml
+++ b/.github/workflows/build_1_20_4_v2.yml
@@ -29,9 +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
-        run: gradle applyPatches
+        run: gradle applyPatches --scan
       - name: CreateJar
-        run: gradle createReobfBundlerJar createReobfPaperclipJar
+        run: gradle createReobfBundlerJar createReobfPaperclipJar --scan
       - name: SetENV
         run: |
           sh scripts/SetENV.sh
diff --git a/gradle.properties b/gradle.properties
index 0f0605d..2f3bc12 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -8,6 +8,6 @@ org.gradle.parallel = true
 org.gradle.vfs.watch = false
 org.gradle.jvmargs = -Xmx3G
 
-mcVersion= 1.20.4
-GroupMCV= 1.20
-preVersion= false
\ No newline at end of file
+mcVersion = 1.20.4
+GroupMCV = 1.20
+preVersion = false
\ No newline at end of file
diff --git a/scripts/SetENV.sh b/scripts/SetENV.sh
index f94e852..09d428c 100644
--- a/scripts/SetENV.sh
+++ b/scripts/SetENV.sh
@@ -13,6 +13,7 @@ release_tag="$mcversion-$commitid"
 jarName="$project_id-$mcversion-paperclip.jar"
 jarName_dir="build/libs/$jarName"
 make_latest=$([ $preVersion = "true" ] && echo "false" || echo "true")
+number=$(git log --oneline master ^`git describe --tags --abbrev=0` | wc -l)
 
 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