Update CI

.github/workflows/build_1_20_4_v2.yml

@@ -10,6 +10,7 @@ permissions: write-all
 jobs:
   build:
     runs-on: ubuntu-latest
+    environment: default
 
     steps:
       - name: Checkout Git Repository
@@ -23,18 +24,18 @@ jobs:
         run: |
           git config --global user.email "ci@luminolmc.com"
           git config --global user.name "Luminol CI"
-    #   - name: Apply Patches
-    #     run: ./gradlew applyPatches
-    #   - name: Build
-    #     run: ./gradlew createReobfBundlerJar createReobfPaperclipJar
-    #   - uses: "actions/upload-artifact@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: Apply Patches
+        run: ./gradlew applyPatches
+      - name: Build
+        run: ./gradlew createReobfBundlerJar createReobfPaperclipJar
+      - uses: "actions/upload-artifact@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: setenv
         run: |
           sh scripts/SetENV.sh
@@ -58,6 +59,6 @@ jobs:
       - name: Push to Api
         if: "!contains(github.event.commits[0].message, '[release-skip]')"
         env:
-          secret_v2: ${{ secrets.API_V2_PUSH_TOKEN }}
+          secret_v2: ${{ secrets.API_KEY }}
           tag: ${{ env.tag }}
         run: sh scripts/PushToAPI.sh

scripts/PushToAPI.sh

@@ -5,23 +5,20 @@ sha256() {
 prop() {
   grep "${1}" gradle.properties | cut -d'=' -f2 | sed 's/\r//'
 }
-echo "$tag"
 project_id="luminol"
 mcversion_group=$(prop GroupMCV)
 mcversion=$(prop mcVersion)
-echo "$mcversion_group - $mcversion"
 pre=$(prop preVersion)
 if [ $pre = "true" ]; then
   channel="experimental"
 else
   channel="default"
 fi
-number=$(git log --oneline "ver/1.20.4" ^$(git describe --tags --abbrev=0) | wc -l)
-changes=$(git log --pretty='%H<<<%s>>>' -"$number" | sed ':a;N;$!ba;s/\n//g')
+changes=$(git log -1 --pretty='[{"commit": "%H", "message": "%s", "summary": "%b"}]')
 jar_sha256=`sha256 build/libs/luminol-1.20.4-paperclip.jar`
-echo "$har_sha256"
 jar_name="luminol-1.20.4-paperclip.jar"
 ctime=$(date -u +"%s")"000"
-echo "$ctime"
 # v2
+echo "Authentication: $secret_v2"
+echo "[DEBUG] curl --location --request POST "https://api.luminolmc.com/v2/projects/$project_id/$mcversion/build/commit" --header "Content-Type: application/json" --header "Authentication: $secret_v2" --data-raw "{\"version_group\":\"$mcversion_group\",\"channel\":\"$channel\",\"changes\":\"$changes\",\"jar_name\":\"$jar_name\",\"sha256\":\"$jar_sha256\",\"release_tag\":\"$tag\",\"time\":\"$ctime\"}""
 curl --location --request POST "https://api.luminolmc.com/v2/projects/$project_id/$mcversion/build/commit" --header "Content-Type: application/json" --header "Authentication: $secret_v2" --data-raw "{\"version_group\":\"$mcversion_group\",\"channel\":\"$channel\",\"changes\":\"$changes\",\"jar_name\":\"$jar_name\",\"sha256\":\"$jar_sha256\",\"release_tag\":\"$tag\",\"time\":\"$ctime\"}"

scripts/SetENV.sh

@@ -3,16 +3,11 @@ prop() {
 }
 
 commitid=$(git log --pretty='%h' -1)
-echo "$commitid"
 mcversion=$(prop mcVersion)
-echo "$mcversion"
 preVersion=$(prop preVersion)
-echo "$preVersion"
 release_tag="$mcversion-$commitid"
-echo "$release_tag"
 jarName="build/libs/luminol-1.20.4-paperclip.jar"
 make_latest=$([ $preVersion = "true" ] && echo "false" || echo "true")
-echo "$make_latest"
 
 echo "commitid=$commitid" >> $GITHUB_ENV
 echo "mcversion=$mcversion" >> $GITHUB_ENV
@@ -20,4 +15,4 @@ echo "$mcversion"
 echo "tag=$release_tag" >> $GITHUB_ENV
 echo "jar=$jarName" >> $GITHUB_ENV
 echo "pre=$preVersion" >> $GITHUB_ENV
-echo "make_latest=$make_latest" >> $GITHUB_ENV
+echo "make_latest=$make_latest" >> $GITHUB_ENV