diff --git a/.github/workflows/leaves.yml b/.github/workflows/leaves.yml index e8157571..0deb4b44 100644 --- a/.github/workflows/leaves.yml +++ b/.github/workflows/leaves.yml @@ -21,7 +21,7 @@ jobs: uses: actions/checkout@v3 with: fetch-depth: 0 - - name: Set up JDK 17 + - name: Get JDK 17 uses: actions/setup-java@v2 with: java-version: '17' @@ -34,22 +34,18 @@ jobs: uses: gradle/gradle-build-action@937999e9cc2425eddc7fd62d1053baf041147db7 with: arguments: applyPatches - - name: Paperclip Jar + - name: Create Paperclip Jar uses: gradle/gradle-build-action@937999e9cc2425eddc7fd62d1053baf041147db7 with: arguments: createReobfPaperclipJar - - name: Rename Jar And Set env - run: | - mv build/libs/Leaves-paperclip-1.19.2-R0.1-SNAPSHOT-reobf.jar leaves-1.19.2.jar - echo "name=Leaves-`git rev-parse --short HEAD`" >> $GITHUB_ENV - echo "tag=1.19.2-`git rev-parse --short HEAD`" >> $GITHUB_ENV - sh scripts/GetReleaseInfo.sh + - name: Get Release Info + run: sh scripts/GetReleaseInfo.sh - name: Create Release uses: ncipollo/release-action@v1 with: - artifacts: leaves-1.19.2.jar - bodyFile: "releaseinfo.md" + artifacts: ${{ env.jar }} + bodyFile: ${{ env.info }} tag: ${{ env.tag }} - prerelease: false name: ${{ env.name }} token: ${{ secrets.GITHUB_TOKEN }} + prerelease: false diff --git a/gradle.properties b/gradle.properties index ca74a457..449320ec 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ -group = top.leavesmc.leaves -version = 1.19.2-R0.1-SNAPSHOT +group=top.leavesmc.leaves +version=1.19.2-R0.1-SNAPSHOT -mcVersion = 1.19.2 -packageVersion = 1_19_R1 +mcVersion=1.19.2 +packageVersion=1_19_R1 org.gradle.jvmargs=-Xmx2G paperRef=ef0e5a642d33ac62f070c45a61cb42647b2744cd diff --git a/scripts/GetReleaseInfo.sh b/scripts/GetReleaseInfo.sh index efa3093b..aa2c3e9a 100644 --- a/scripts/GetReleaseInfo.sh +++ b/scripts/GetReleaseInfo.sh @@ -6,20 +6,36 @@ md5() { md5sum $1 | awk '{print $1}' } -commitid=`git log --pretty='%h' -1` -tagid="1.19.2-$commitid" +prop() { + grep "${1}" gradle.properties | cut -d'=' -f2 | sed 's/\r//' +} -echo "Leaves-$commitid [![download](https://img.shields.io/github/downloads/LeavesMC/Leaves/$tagid/total?color=0)](https://github.com/Leaves/LeavesMC/releases/download/$tagid/leaves-1.19.2.jar)" >> releaseinfo.md -echo "=====" >> releaseinfo.md -echo "" >> releaseinfo.md -echo "### Commit Message" >> releaseinfo.md +commitid=$(git log --pretty='%h' -1) +mcversion=$(prop mcVersion) +gradleVersion=$(prop version) +tagid="$mcversion-$commitid" +jarName="leaves-$mcversion.jar" +releaseinfo="releaseinfo.md" + +rm -f $releaseinfo + +mv build/libs/Leaves-paperclip-$gradleVersion-reobf.jar $jarName +echo "name=Leaves-$commitid" >> $GITHUB_ENV +echo "tag=$tagid" >> $GITHUB_ENV +echo "jar=$jarName" >> $GITHUB_ENV +echo "info=$releaseinfo" >> $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 "=====" >> $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.md +echo "$(git log --pretty='> [%h] %s' -$number)" >> $releaseinfo -echo "" >> releaseinfo.md -echo "### Checksum" >> releaseinfo.md -echo "| File | leaves-1.19.2.jar |" >> releaseinfo.md -echo "| ---- | ---- |" >> releaseinfo.md -echo "| MD5 | `md5 "leaves-1.19.2.jar"` |" >> releaseinfo.md -echo "| SHA1 | `sha1 "leaves-1.19.2.jar"` |" >> releaseinfo.md +echo "" >> $releaseinfo +echo "### Checksum" >> $releaseinfo +echo "| File | $jarName |" >> $releaseinfo +echo "| ---- | ---- |" >> $releaseinfo +echo "| MD5 | `md5 $jarName` |" >> $releaseinfo +echo "| SHA1 | `sha1 $jarName` |" >> $releaseinfo