Update CI

.github/workflows/build_1_20_4_v2.yml

@@ -6,18 +6,15 @@ on:
     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
-    #   - name: Validate Gradle wrapper
-    #     uses: gradle/wrapper-validation-action@v1
-    #   - name: Setup Gradle
-    #     uses: gradle/gradle-build-action@v2
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
@@ -35,52 +32,33 @@ jobs:
         with:
           name: "Luminol CI Artifacts"
           path: "build/libs/*.jar"
-      - name: Get version from asset
-        id: get_version
-        run: echo "::set-output name=version::$(echo build/libs/*.jar | grep -oP 'bundler-\K\d+\.\d+\.\d+' | head -1)"
-      - name: Set outputs
-        id: short_sha
-        run: |
-          echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
-      - name: Set env
-        run:  echo "tag=${{ steps.get_version.outputs.version }}-${{ steps.short_sha.outputs.sha_short }}" >> $GITHUB_ENV
       - 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: Get and Set ENV
-        run: sh scripts/GetSetENV.sh
-#      - name: Create Release
-#        if: "!contains(github.event.commits[0].message, '[release-skip]')"
-#        uses: ncipollo/release-action@v1.12.0
-#        with:
-#          tag: ${{ env.tag }}
-#          name: Luminol ${{ steps.get_version.outputs.version }} - ${{ steps.short_sha.outputs.sha_short }}
-#          body: |
-#           📦Version: `${{ steps.get_version.outputs.version }}` | Commit ${{ steps.short_sha.outputs.sha_short }} [![download](https://img.shields.io/github/downloads/LuminolMC/Luminol/${{ env.tag }}/total?color=0&style=flat-square)](https://github.com/LeavesMC/LuminolMC/Luminol/download/${{ steps.get_version.outputs.version }}-${{ steps.short_sha.outputs.sha_short }}/luminol-1.20.4-paperclip.jar)
-#            This release is automatically compiled by GitHub Actions
-#          artifacts: |
-#            build/libs/luminol-1.20.4-bundler.jar
-#            build/libs/luminol-1.20.4-paperclip.jar
-#          generateReleaseNotes: true
-#          prerelease: ${{ env.pre }}
-#          makeLatest: ${{ env.make_latest }}
-#          token: "${{ secrets.GITHUB_TOKEN }}"
-      - name: Release Artifacts
-        uses: svenstaro/upload-release-action@v2
+      - name: setenv
+        run: |
+          sh scripts/SetENV.sh
+          echo "${{ env.tag }}"
+      - name: Create Release
+        if: "!contains(github.event.commits[0].message, '[release-skip]')"
+        uses: ncipollo/release-action@v1.12.0
         with:
-          release_name: "Luminol MC1.20.4 - ${{ github.event.repository.updated_at}}"
           tag: ${{ env.tag }}
+          name: Luminol ${{ env.mcversion }} - ${{ env.commitid }}
           body: |
-            📦Version: `${{ steps.get_version.outputs.version }}` | Commit ${{ steps.short_sha.outputs.sha_short }} [![download](https://img.shields.io/github/downloads/LuminolMC/Luminol/${{ env.tag }}/total?color=0&style=flat-square)](https://github.com/LeavesMC/LuminolMC/Luminol/download/${{ steps.get_version.outputs.version }}-${{ steps.short_sha.outputs.sha_short }}/luminol-1.20.4-paperclip.jar)
-             This release is automatically compiled by GitHub Actions
-          repo_token: "${{ secrets.GITHUB_TOKEN }}"
-          file: "build/libs/luminol-1.20.4-paperclip.jar"
-          file_glob: true
+           📦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)
+            This release is automatically compiled by GitHub Actions
+          artifacts: |
+            build/libs/luminol-1.20.4-bundler.jar
+            build/libs/luminol-1.20.4-paperclip.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]')"
         env:
-          secret_v2: ${{ secrets.API_V2_PUSH_TOKEN }}
+          secret_v2: ${{ secrets.API_KEY }}
           tag: ${{ env.tag }}
         run: sh scripts/PushToAPI.sh

gradle.properties

@@ -7,5 +7,7 @@ org.gradle.caching = true
 org.gradle.parallel = true
 org.gradle.vfs.watch = false
 org.gradle.jvmargs = -Xmx3G
+
 mcVersion=1.20.4
+GroupMCV=1.20
 preVersion=false

scripts/PushToAPI.sh

@@ -5,23 +5,20 @@ sha256() {
 prop() {
   grep "${1}" gradle.properties | cut -d'=' -f2 | sed 's/\r//'
 }
-echo "$tag"
 project_id="luminol"
-project_name="uminol"
+mcversion_group=$(prop GroupMCV)
 mcversion=$(prop mcVersion)
-ctime=$(date -u +"%Y-%m-%dT%H:%M:%SZ")
 pre=$(prop preVersion)
 if [ $pre = "true" ]; then
   channel="experimental"
 else
   channel="default"
 fi
-promoted=false
-
-number=$(git log --oneline master ^`git describe --tags --abbrev=0` | wc -l)
-changes=$(git log --pretty='%H<<<%s>>>' -"$number" | sed ':a;N;$!ba;s/\n//g')
-jar_name="build/libs/luminol-1.20.4-paperclip.jar"
-jar_sha256=`sha256 $jar_name`
-
+changes=$(git log -1 --pretty='[{"commit": "%H", "message": "%s", "summary": "%b"}]')
+jar_sha256=`sha256 build/libs/luminol-1.20.4-paperclip.jar`
+jar_name="luminol-1.20.4-paperclip.jar"
+ctime=$(date -u +"%s")"000"
 # v2
-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 "{\"project_id\":\"$project_id\",\"version\":\"$mcversion\",\"channel\":\"$channel\",\"changes\":\"$changes\",\"jar_name\":\"$jar_name\",\"sha256\":\"$jar_sha256\",\"tag\":\"$tag\"}"
+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

@@ -9,7 +9,10 @@ release_tag="$mcversion-$commitid"
 jarName="build/libs/luminol-1.20.4-paperclip.jar"
 make_latest=$([ $preVersion = "true" ] && echo "false" || echo "true")
 
+echo "commitid=$commitid" >> $GITHUB_ENV
+echo "mcversion=$mcversion" >> $GITHUB_ENV
+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