fix ci

.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 --scan
+        run: gradle applyPatches
       - name: CreateJar
-        run: gradle createReobfBundlerJar createReobfPaperclipJar --scan
+        run: gradle createReobfBundlerJar createReobfPaperclipJar
       - name: SetENV
         run: |
           sh scripts/SetENV.sh

scripts/PushToAPI.sh

@@ -2,7 +2,7 @@ sha256() {
   sha256sum $1 | awk '{print $1}'
 }
 prop() {
-  grep "${1}" gradle.properties | cut -d'=' -f2 | sed 's/\r//'
+  grep "^[[:space:]]*${1}" gradle.properties | cut -d'=' -f2 | sed 's/^[[:space:]]*//; s/\r//'
 }
 
 mcversion_group=$(prop GroupMCV)

scripts/SetENV.sh

@@ -13,7 +13,6 @@ 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
@@ -22,7 +21,7 @@ mv build/libs/$project_id-bundler-$grdversion-reobf.jar build/libs/$project_id-$
 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=$(git log --pretty='> [%h] %s' -1)" >> $GITHUB_ENV
 echo "$commit_msg"
 echo "mcversion=$mcversion" >> $GITHUB_ENV
 echo "pre=$preVersion" >> $GITHUB_ENV