diff --git a/.github/workflows/build_1_20_4_v2.yml b/.github/workflows/build_1_20_4_v2.yml index e1a0806..77c0d21 100644 --- a/.github/workflows/build_1_20_4_v2.yml +++ b/.github/workflows/build_1_20_4_v2.yml @@ -23,38 +23,38 @@ 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 echo "${{ env.tag }}" - - 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 ${{ 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) - 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: Create Release + # if: "!contains(github.event.commits[0].message, '[release-skip]')" + # uses: ncipollo/release-action@v1.12.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) + # 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: diff --git a/scripts/PushToAPI.sh b/scripts/PushToAPI.sh index f9a83ad..d14d4c9 100644 --- a/scripts/PushToAPI.sh +++ b/scripts/PushToAPI.sh @@ -7,7 +7,7 @@ prop() { } echo "$tag" project_id="luminol" -mcversion_group=$(prop GroupMCV) +mcversion_group=$(prop GroupMCV ) mcversion=$(prop mcVersion) echo "$mcversion_group - $mcversion" pre=$(prop preVersion) @@ -16,10 +16,11 @@ if [ $pre = "true" ]; then else channel="default" fi -number=$(git log --oneline "ver/1.20.4" ^$(git describe --tags --abbrev=0) | wc -l) +latest_tag=$(git describe --tags $(git rev-list --tags --max-count=1)) +number=$(git log --oneline "ver/1.20.4" ^$latest_tag | wc -l) changes=$(git log --pretty='%H<<<%s>>>' -"$number" | sed ':a;N;$!ba;s/\n//g') jar_sha256=`sha256 build/libs/luminol-1.20.4-paperclip.jar` -echo "$har_sha256" +echo "$jar_sha256" jar_name="luminol-1.20.4-paperclip.jar" ctime=$(date -u +"%s")"000" echo "$ctime"