diff --git a/.github/workflows/leaves.yml b/.github/workflows/leaves.yml index ad2bbb2d..cb9ac625 100644 --- a/.github/workflows/leaves.yml +++ b/.github/workflows/leaves.yml @@ -56,20 +56,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Github Releases To Discord - uses: LeGitHubDeTai/github-to-discord@main + uses: tsickert/discord-webhook@v5.3.0 with: - DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }} - DISCORD_USERNAME: Leaves CI - DISCORD_AVATAR: https://avatars.githubusercontent.com/u/93428079 - MESSAGE_TITLE: ${{ env.name }} - MESSAGE_DESCRIPTION: Leaves CI Action - MESSAGE_URL: ${{ env.url }} - MESSAGE_COLOR: 5814783 - CONTENT: ${{ env.changelog }} - SECTION_NAME: "ChangeLog" - AUTHOR_NAME: "LeavesMC" - AUTHOR_URL: "" - AUTHOR_AVATAR: "" - FOOTER_TEXT: "" - FOOTER_URL: "" - IMAGE: null; + webhook-url: ${{ secrets.DISCORD_WEBHOOK }} + raw-data: ${{ env.discordmes }} diff --git a/scripts/GetReleaseInfo.sh b/scripts/GetReleaseInfo.sh index 65e529e3..2d69ea46 100644 --- a/scripts/GetReleaseInfo.sh +++ b/scripts/GetReleaseInfo.sh @@ -15,25 +15,27 @@ mcversion=$(prop mcVersion) gradleVersion=$(prop version) tagid="$mcversion-$commitid" jarName="leaves-$mcversion.jar" +leavesid="Leaves-$commitid" releaseinfo="releaseinfo.md" +discordmes="discordmes.json" +rm -f $discordmes rm -f $releaseinfo mv build/libs/Leaves-paperclip-$gradleVersion-reobf.jar $jarName -echo "name=Leaves-$commitid" >> $GITHUB_ENV +echo "name=$leavesid" >> $GITHUB_ENV echo "tag=$tagid" >> $GITHUB_ENV echo "jar=$jarName" >> $GITHUB_ENV echo "info=$releaseinfo" >> $GITHUB_ENV -echo "url=https://github.com/LeavesMC/Leaves/releases/tag/$tagid" >> $GITHUB_ENV +echo "discordmes=$discordmes" >> $GITHUB_ENV -echo "Leaves-$commitid [![download](https://img.shields.io/github/downloads/LeavesMC/Leaves/$tagid/total?color=0)](https://github.com/Leaves/LeavesMC/releases/download/$tagid/$jarName)" >> $releaseinfo +echo "$leavesid [![download](https://img.shields.io/github/downloads/LeavesMC/Leaves/$tagid/total?color=0)](https://github.com/Leaves/LeavesMC/releases/download/$tagid/$jarName)" >> $releaseinfo echo "=====" >> $releaseinfo echo "" >> $releaseinfo echo "### Commit Message" >> $releaseinfo number=$(git log --oneline master ^`git describe --tags --abbrev=0` | wc -l) echo "$(git log --pretty='> [%h] %s' -$number)" >> $releaseinfo -echo "changelog=$(git log --pretty='> [%h] %s' -$number)" >> $GITHUB_ENV echo "" >> $releaseinfo echo "### Checksum" >> $releaseinfo @@ -41,3 +43,6 @@ echo "| File | $jarName |" >> $releaseinfo echo "| ---- | ---- |" >> $releaseinfo echo "| MD5 | `md5 $jarName` |" >> $releaseinfo echo "| SHA1 | `sha1 $jarName` |" >> $releaseinfo + +echo "{\"embeds\":[{\"title\":\"$leavesid\",\"url\":\"https://github.com/LeavesMC/Leaves/releases/tag/$tagid\",\"fields\":[{\"name\":\"Changelog\",\"value\":" >> $discordmes +echo "\"$(git log --pretty='> [%h] %s' -$number)\",\"inline\":true}]}]}" >> $discordmes \ No newline at end of file