diff --git a/.github/workflows/leaves.yml b/.github/workflows/leaves.yml index 18cafe80..b1621b75 100644 --- a/.github/workflows/leaves.yml +++ b/.github/workflows/leaves.yml @@ -63,6 +63,8 @@ jobs: git push origin HEAD:Leaves - name: Get Release Info run: sh scripts/GetReleaseInfo.sh + env: + BUILD_NUMBER: ${{ env.BUILD_NUMBER }} - name: Create Release if: "!contains(github.event.commits[0].message, '[release-skip]')" uses: ncipollo/release-action@v1 diff --git a/scripts/GetReleaseInfo.sh b/scripts/GetReleaseInfo.sh index 672dd153..15e732ef 100644 --- a/scripts/GetReleaseInfo.sh +++ b/scripts/GetReleaseInfo.sh @@ -20,7 +20,7 @@ gradleVersion=$(prop version) preVersion=$(prop preVersion) tagid="$mcversion-$commitid" jarName="leaves-$mcversion.jar" -leavesid="Leaves-$commitid" +leavesid="Leaves-$BUILD_NUMBER-$commitid" releaseinfo="releaseinfo.md" discordmes="discordmes.json" make_latest=$([ $preVersion = "true" ] && echo "false" || echo "true") @@ -28,7 +28,7 @@ make_latest=$([ $preVersion = "true" ] && echo "false" || echo "true") rm -f $discordmes rm -f $releaseinfo -mv build/libs/Leaves-paperclip-$gradleVersion-reobf.jar $jarName +mv build/libs/Leaves-leavesclip-$gradleVersion-reobf.jar $jarName echo "name=$leavesid" >> $GITHUB_ENV echo "tag=$tagid" >> $GITHUB_ENV echo "jar=$jarName" >> $GITHUB_ENV