diff --git a/.github/workflows/build_1_20_4_v2.yml b/.github/workflows/build_1_20_4_v2.yml index b509669..71cbfcb 100644 --- a/.github/workflows/build_1_20_4_v2.yml +++ b/.github/workflows/build_1_20_4_v2.yml @@ -24,20 +24,19 @@ 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: ./gradlew applyPatches - - name: Build - run: ./gradlew build - - name: CreateJar - run: ./gradlew createReobfBundlerJar createReobfPaperclipJar - - run: "ls build/libs" - - uses: "actions/upload-artifact@v4" + uses: gradle/actions/setup-gradle@v3 with: - name: "Luminol CI Artifacts" + arguments: applyPatches + run: ./gradlew applyPatches + - name: CreateJar + uses: gradle/actions/setup-gradle@v3 + with: + arguments: createReobfBundlerJar createReobfPaperclipJar + - name: Upload Artifact + uses: "actions/upload-artifact@v4" + with: + name: "${{ env.project_id_b }} 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 @@ -47,20 +46,24 @@ 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.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]')" + run: sh scripts/PushToAPI.sh env: secret_v2: ${{ secrets.API_KEY }} tag: ${{ env.tag }} - run: sh scripts/PushToAPI.sh + project_id: ${{ env.project_id }} diff --git a/scripts/PushToAPI.sh b/scripts/PushToAPI.sh index 0ac7d12..b5806e7 100644 --- a/scripts/PushToAPI.sh +++ b/scripts/PushToAPI.sh @@ -5,10 +5,10 @@ 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" @@ -17,8 +17,8 @@ else 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 diff --git a/scripts/SetENV.sh b/scripts/SetENV.sh index 22095f9..3655c9e 100644 --- a/scripts/SetENV.sh +++ b/scripts/SetENV.sh @@ -2,16 +2,29 @@ prop() { grep "${1}" gradle.properties | cut -d'=' -f2 | sed 's/\r//' } +project_id_b="Luminol" +project_id="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 "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