From f38b660e80f0ff847af8acac3e0f310679846eea Mon Sep 17 00:00:00 2001 From: moonleay Date: Fri, 10 May 2024 04:29:03 +0200 Subject: [PATCH] ci: updated release ci workflow and build gradle Signed-off-by: moonleay --- .forgejo/workflows/build-release.yml | 2 +- build.gradle.kts | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/build-release.yml b/.forgejo/workflows/build-release.yml index fe498d7..56ac750 100644 --- a/.forgejo/workflows/build-release.yml +++ b/.forgejo/workflows/build-release.yml @@ -23,7 +23,7 @@ jobs: - name: Set git tag description id: vars2 - run: echo "tag_desc=$(git for-each-ref --format='%(contents)' refs/tags/${{ steps.gitvar.outputs.tag }})" >> $GITHUB_OUTPUT + run: echo "tag_desc=$(git show ${{ steps.gitvar.outputs.tag }})" >> $GITHUB_OUTPUT - name: Check outputs run: echo "short ${{ steps.vars.outputs.sha_short }}, ref $GITHUB_REF, tag ${{ steps.gitvar.outputs.tag }}, tag_desc ${{ steps.vars2.outputs.tag_desc }}" diff --git a/build.gradle.kts b/build.gradle.kts index efaf729..6afaacd 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -39,6 +39,11 @@ val mavenVersion = ver val modId: String by project val modName: String by project +val git_tag_message_list = (System.getenv("GIT_TAG") ?: "\n\n\n\n\n\nnot\nfound").split("\n") +val git_tag_message = git_tag_message_list.subList(4, git_tag_message_list.size - 1).toString() + .replace(",", "\n") + .split("commit")[0] + /* * Gimbal version stuff * */ @@ -219,7 +224,7 @@ modrinth { uploadFile.set(tasks.remapJar) // With Loom, this MUST be set to `remapJar` instead of `jar`! gameVersions.addAll(listOf(project.ext["minecraft.version"] as String)) // Must be an array, even with only one version loaders.add("fabric") // Must also be an array - no need to specify this if you're using Loom or ForgeGradle - changelog.set(System.getenv("GIT_TAG") ?: "Could not get tag description") + changelog.set(git_tag_message) dependencies { // A special DSL for creating dependencies // scope.type // The scope can be `required`, `optional`, `incompatible`, or `embedded`