From b2532ffcf0d3fb90d7be6025b2b2a38b558bdb27 Mon Sep 17 00:00:00 2001 From: z0z0r4 Date: Fri, 28 Jul 2023 19:22:55 +0800 Subject: [PATCH 01/10] Update leaves.yml --- .github/workflows/leaves.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/leaves.yml b/.github/workflows/leaves.yml index 6a818d39..adf8ad4f 100644 --- a/.github/workflows/leaves.yml +++ b/.github/workflows/leaves.yml @@ -72,3 +72,7 @@ jobs: with: name: ${{ env.jar }} path: ${{ env.jar }} + - name: Push to Api + env: + secret: ${{ secrets.API_SECRET }} + run: sh scripts/push_to_api.sh From 027539e4c26a118218227fbb5c8abed0f0aacb6b Mon Sep 17 00:00:00 2001 From: z0z0r4 Date: Fri, 28 Jul 2023 19:28:31 +0800 Subject: [PATCH 02/10] Create PushToAPI.sh --- scripts/PushToAPI.sh | 47 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 scripts/PushToAPI.sh diff --git a/scripts/PushToAPI.sh b/scripts/PushToAPI.sh new file mode 100644 index 00000000..2d4f0671 --- /dev/null +++ b/scripts/PushToAPI.sh @@ -0,0 +1,47 @@ +sha256() { + sha256sum $1 | awk '{print $1}' +} + +prop() { + grep "${1}" gradle.properties | cut -d'=' -f2 | sed 's/\r//' +} +echo "$tag" +project_id="leaves" +project_name="leaves" +mcversion=$(prop mcVersion) +ctime=$(date -u +"%Y-%m-%dT%H:%M:%SZ") +pre=$(prop preVersion) +if [ $pre = "true" ]; then + channel="experimental" +else + channel="default" +fi +promoted=false + +number=$(git log --oneline master ^`git describe --tags --abbrev=0` | wc -l) +changes=$(echo "(git log --pretty='%H<<<%s>>>' -number)" | sed 's/\\n/\\\\n/g') +jar_name="leaves-$mcversion.jar" +jar_sha256=`sha256 $jar_name` + +data=$(cat < Date: Fri, 28 Jul 2023 19:31:38 +0800 Subject: [PATCH 03/10] Update leaves.yml --- .github/workflows/leaves.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/leaves.yml b/.github/workflows/leaves.yml index adf8ad4f..434b5a1f 100644 --- a/.github/workflows/leaves.yml +++ b/.github/workflows/leaves.yml @@ -74,5 +74,5 @@ jobs: path: ${{ env.jar }} - name: Push to Api env: - secret: ${{ secrets.API_SECRET }} + secret: ${{ secrets.API_PUSH_TOKEN }} run: sh scripts/push_to_api.sh From d4429844f78a274a2bfc88621fca09df1c00c749 Mon Sep 17 00:00:00 2001 From: z0z0r4 Date: Fri, 28 Jul 2023 19:33:05 +0800 Subject: [PATCH 04/10] Update leaves.yml add artifact --- .github/workflows/leaves.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/leaves.yml b/.github/workflows/leaves.yml index 434b5a1f..72a5b5f9 100644 --- a/.github/workflows/leaves.yml +++ b/.github/workflows/leaves.yml @@ -72,6 +72,11 @@ jobs: with: name: ${{ env.jar }} path: ${{ env.jar }} + - name: Upload Artifact + uses: actions/upload-artifact@v2 + with: + name: ${{ env.jar }} + path: ${{ env.jar }} - name: Push to Api env: secret: ${{ secrets.API_PUSH_TOKEN }} From 9fb77e20f2f59a55fa344e2502f6b355aef7f324 Mon Sep 17 00:00:00 2001 From: violetc <58360096+s-yh-china@users.noreply.github.com> Date: Fri, 28 Jul 2023 19:34:44 +0800 Subject: [PATCH 05/10] Update leaves.yml --- .github/workflows/leaves.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/leaves.yml b/.github/workflows/leaves.yml index 72a5b5f9..dce95847 100644 --- a/.github/workflows/leaves.yml +++ b/.github/workflows/leaves.yml @@ -72,12 +72,8 @@ jobs: with: name: ${{ env.jar }} path: ${{ env.jar }} - - name: Upload Artifact - uses: actions/upload-artifact@v2 - with: - name: ${{ env.jar }} - path: ${{ env.jar }} - name: Push to Api + if: "!contains(github.event.commits[0].message, '[release-skip]')" env: secret: ${{ secrets.API_PUSH_TOKEN }} run: sh scripts/push_to_api.sh From 535faf37072673a7d9345a0ddc398bba49a788d1 Mon Sep 17 00:00:00 2001 From: violetc <58360096+s-yh-china@users.noreply.github.com> Date: Fri, 28 Jul 2023 19:48:37 +0800 Subject: [PATCH 06/10] Update leaves.yml --- .github/workflows/leaves.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/leaves.yml b/.github/workflows/leaves.yml index dce95847..b7f4beed 100644 --- a/.github/workflows/leaves.yml +++ b/.github/workflows/leaves.yml @@ -76,4 +76,5 @@ jobs: if: "!contains(github.event.commits[0].message, '[release-skip]')" env: secret: ${{ secrets.API_PUSH_TOKEN }} + tag: ${{ env.tag }} run: sh scripts/push_to_api.sh From f363fa3142f91dcabbbfcf9406cdfc650a6b88b0 Mon Sep 17 00:00:00 2001 From: z0z0r4 Date: Wed, 2 Aug 2023 10:50:01 +0800 Subject: [PATCH 07/10] add /upload_file --- scripts/PushToAPI.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/PushToAPI.sh b/scripts/PushToAPI.sh index 04baba2e..41328d68 100644 --- a/scripts/PushToAPI.sh +++ b/scripts/PushToAPI.sh @@ -24,3 +24,4 @@ jar_name="leaves-$mcversion.jar" jar_sha256=`sha256 $jar_name` curl --location --request POST "https://api.leavesmc.top/new_release" --header "Content-Type: application/json" --data-raw "{\"project_id\":\"$project_id\",\"project_name\":\"$project_name\",\"version\":\"$mcversion\",\"time\":\"$ctime\",\"channel\":\"$channel\",\"promoted\":$promoted,\"changes\":\"$changes\",\"downloads\":{\"application\":{\"name\":\"$jar_name\",\"sha256\":\"$jar_sha256\",\"url\":\"https://github.com/LeavesMC/Leaves/releases/download/$tag/$jar_name\"}},\"secret\":\"$secret\"}" +curl --location --request POST "https://api.leavesmc.top/upload_file" -F "file=@$jar" -F "filename=$jar_name" -F "filehash=$jar_sha256" -F "secret=$secret" \ No newline at end of file From c2d2f36df17e94c009703fde6e92195952caf731 Mon Sep 17 00:00:00 2001 From: z0z0r4 Date: Wed, 2 Aug 2023 10:54:02 +0800 Subject: [PATCH 08/10] fix: $jar_name --- scripts/PushToAPI.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/PushToAPI.sh b/scripts/PushToAPI.sh index 41328d68..70dc0af4 100644 --- a/scripts/PushToAPI.sh +++ b/scripts/PushToAPI.sh @@ -24,4 +24,4 @@ jar_name="leaves-$mcversion.jar" jar_sha256=`sha256 $jar_name` curl --location --request POST "https://api.leavesmc.top/new_release" --header "Content-Type: application/json" --data-raw "{\"project_id\":\"$project_id\",\"project_name\":\"$project_name\",\"version\":\"$mcversion\",\"time\":\"$ctime\",\"channel\":\"$channel\",\"promoted\":$promoted,\"changes\":\"$changes\",\"downloads\":{\"application\":{\"name\":\"$jar_name\",\"sha256\":\"$jar_sha256\",\"url\":\"https://github.com/LeavesMC/Leaves/releases/download/$tag/$jar_name\"}},\"secret\":\"$secret\"}" -curl --location --request POST "https://api.leavesmc.top/upload_file" -F "file=@$jar" -F "filename=$jar_name" -F "filehash=$jar_sha256" -F "secret=$secret" \ No newline at end of file +curl --location --request POST "https://api.leavesmc.top/upload_file" -F "file=@$jar_name" -F "filename=$jar_name" -F "filehash=$jar_sha256" -F "secret=$secret" \ No newline at end of file From 50c02c42885a4afbc97cc78ff6271aeec8627691 Mon Sep 17 00:00:00 2001 From: z0z0r4 Date: Wed, 2 Aug 2023 10:55:45 +0800 Subject: [PATCH 09/10] disable publish --- .github/workflows/leaves.yml | 58 ++++++++++++++++++------------------ 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/.github/workflows/leaves.yml b/.github/workflows/leaves.yml index c49ca983..5b34c0ec 100644 --- a/.github/workflows/leaves.yml +++ b/.github/workflows/leaves.yml @@ -41,37 +41,37 @@ jobs: uses: gradle/gradle-build-action@937999e9cc2425eddc7fd62d1053baf041147db7 with: arguments: createReobfPaperclipJar - - name: Publish API - uses: gradle/gradle-build-action@937999e9cc2425eddc7fd62d1053baf041147db7 - with: - arguments: publish -PleavesUsername=${{ secrets.REPO_USERNAME }} -PleavesPassword=${{ secrets.REPO_PASSWORD }} + # - name: Publish API + # uses: gradle/gradle-build-action@937999e9cc2425eddc7fd62d1053baf041147db7 + # with: + # arguments: publish -PleavesUsername=${{ secrets.REPO_USERNAME }} -PleavesPassword=${{ secrets.REPO_PASSWORD }} - name: Get Release Info run: sh scripts/GetReleaseInfo.sh - - name: Create Release - if: "!contains(github.event.commits[0].message, '[release-skip]')" - uses: ncipollo/release-action@v1.12.0 - with: - artifacts: ${{ env.jar }} - bodyFile: ${{ env.info }} - tag: ${{ env.tag }} - name: ${{ env.name }} - prerelease: ${{ env.pre }} - token: ${{ secrets.GITHUB_TOKEN }} - makeLatest: ${{ env.make_latest }} - - name: Delete Draft Releases - uses: hugo19941994/delete-draft-releases@v1.0.0 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Github Releases To Discord - uses: tsickert/discord-webhook@v5.3.0 - with: - webhook-url: ${{ secrets.DISCORD_WEBHOOK }} - raw-data: ${{ env.discordmes }} - - name: Upload Artifact - uses: actions/upload-artifact@v2 - with: - name: ${{ env.jar }} - path: ${{ env.jar }} + # - name: Create Release + # if: "!contains(github.event.commits[0].message, '[release-skip]')" + # uses: ncipollo/release-action@v1.12.0 + # with: + # artifacts: ${{ env.jar }} + # bodyFile: ${{ env.info }} + # tag: ${{ env.tag }} + # name: ${{ env.name }} + # prerelease: ${{ env.pre }} + # token: ${{ secrets.GITHUB_TOKEN }} + # makeLatest: ${{ env.make_latest }} + # - name: Delete Draft Releases + # uses: hugo19941994/delete-draft-releases@v1.0.0 + # env: + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # - name: Github Releases To Discord + # uses: tsickert/discord-webhook@v5.3.0 + # with: + # webhook-url: ${{ secrets.DISCORD_WEBHOOK }} + # raw-data: ${{ env.discordmes }} + # - name: Upload Artifact + # uses: actions/upload-artifact@v2 + # with: + # name: ${{ env.jar }} + # path: ${{ env.jar }} - name: Push to Api if: "!contains(github.event.commits[0].message, '[release-skip]')" env: From 31d020cf90dc6f38b889efe0e89b2856598f99b9 Mon Sep 17 00:00:00 2001 From: z0z0r4 Date: Wed, 2 Aug 2023 11:20:39 +0800 Subject: [PATCH 10/10] Update leaves.yml --- .github/workflows/leaves.yml | 58 ++++++++++++++++++------------------ 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/.github/workflows/leaves.yml b/.github/workflows/leaves.yml index 5b34c0ec..c49ca983 100644 --- a/.github/workflows/leaves.yml +++ b/.github/workflows/leaves.yml @@ -41,37 +41,37 @@ jobs: uses: gradle/gradle-build-action@937999e9cc2425eddc7fd62d1053baf041147db7 with: arguments: createReobfPaperclipJar - # - name: Publish API - # uses: gradle/gradle-build-action@937999e9cc2425eddc7fd62d1053baf041147db7 - # with: - # arguments: publish -PleavesUsername=${{ secrets.REPO_USERNAME }} -PleavesPassword=${{ secrets.REPO_PASSWORD }} + - name: Publish API + uses: gradle/gradle-build-action@937999e9cc2425eddc7fd62d1053baf041147db7 + with: + arguments: publish -PleavesUsername=${{ secrets.REPO_USERNAME }} -PleavesPassword=${{ secrets.REPO_PASSWORD }} - name: Get Release Info run: sh scripts/GetReleaseInfo.sh - # - name: Create Release - # if: "!contains(github.event.commits[0].message, '[release-skip]')" - # uses: ncipollo/release-action@v1.12.0 - # with: - # artifacts: ${{ env.jar }} - # bodyFile: ${{ env.info }} - # tag: ${{ env.tag }} - # name: ${{ env.name }} - # prerelease: ${{ env.pre }} - # token: ${{ secrets.GITHUB_TOKEN }} - # makeLatest: ${{ env.make_latest }} - # - name: Delete Draft Releases - # uses: hugo19941994/delete-draft-releases@v1.0.0 - # env: - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # - name: Github Releases To Discord - # uses: tsickert/discord-webhook@v5.3.0 - # with: - # webhook-url: ${{ secrets.DISCORD_WEBHOOK }} - # raw-data: ${{ env.discordmes }} - # - name: Upload Artifact - # uses: actions/upload-artifact@v2 - # with: - # name: ${{ env.jar }} - # path: ${{ env.jar }} + - name: Create Release + if: "!contains(github.event.commits[0].message, '[release-skip]')" + uses: ncipollo/release-action@v1.12.0 + with: + artifacts: ${{ env.jar }} + bodyFile: ${{ env.info }} + tag: ${{ env.tag }} + name: ${{ env.name }} + prerelease: ${{ env.pre }} + token: ${{ secrets.GITHUB_TOKEN }} + makeLatest: ${{ env.make_latest }} + - name: Delete Draft Releases + uses: hugo19941994/delete-draft-releases@v1.0.0 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Github Releases To Discord + uses: tsickert/discord-webhook@v5.3.0 + with: + webhook-url: ${{ secrets.DISCORD_WEBHOOK }} + raw-data: ${{ env.discordmes }} + - name: Upload Artifact + uses: actions/upload-artifact@v2 + with: + name: ${{ env.jar }} + path: ${{ env.jar }} - name: Push to Api if: "!contains(github.event.commits[0].message, '[release-skip]')" env: