diff --git a/.github/workflows/curseforge_release.yml b/.github/workflows/curseforge_release.yml index 292fdbca912..b630b150651 100644 --- a/.github/workflows/curseforge_release.yml +++ b/.github/workflows/curseforge_release.yml @@ -18,6 +18,10 @@ jobs: - name: Get Mod Version id: get_version + run: echo ::set-output name=version::$(./gradlew getVersionFromJava --q) + + - name: Get Mod Version without Extra + id: get_version_no_extra run: echo ::set-output name=version::$(./gradlew getVersionFromJavaNoExtra --q) - name: Retrieve Jar from Latest Release @@ -34,7 +38,7 @@ jobs: game_versions: "Minecraft 1.12:1.12.2,Java 8,Forge" game_endpoint: "minecraft" release_type: "release" - changelog: "Changelog is available [here](https://github.com/${{ github.repository }}/releases/tag/v${{ steps.get_version.outputs.version }})." + changelog: "Changelog is available [here](https://github.com/${{ github.repository }}/releases/tag/v${{ steps.get_version_no_extra.outputs.version }})." changelog_type: "markdown" relations: "codechicken-lib-1-8:requiredDependency,gregtechce:incompatible,gregtech-chill-edition:incompatible" file_path: "$gregtech-1.12.2-${{ steps.get_version.outputs.version }}.jar" diff --git a/.github/workflows/github_release.yml b/.github/workflows/github_release.yml index 0201b329fed..ad78f7b2558 100644 --- a/.github/workflows/github_release.yml +++ b/.github/workflows/github_release.yml @@ -21,7 +21,7 @@ jobs: uses: actions/checkout@v3 - name: Get Mod Version - id: get_version + id: get_version_no_extra run: echo ::set-output name=version::$(./gradlew getVersionFromJavaNoExtra --q) - name: Get Previous tag @@ -32,7 +32,7 @@ jobs: # exit CI early as a failure if creating this release clashes with the previous version - name: Check if Version Bump is Needed - if: ${{ format('v{0}', steps.get_version.outputs.version) == (steps.previous_tag.outputs.release) }} + if: ${{ format('v{0}', steps.get_version_no_extra.outputs.version) == (steps.previous_tag.outputs.release) }} uses: actions/github-script@v6 with: script: core.setFailed("A version bump from ${{ steps.previous_tag.outputs.release }} is required!") @@ -60,7 +60,7 @@ jobs: - name: Create GitHub Release uses: softprops/action-gh-release@v1 with: - tag_name: v${{ steps.get_version.outputs.version }} + tag_name: v${{ steps.get_version_no_extra.outputs.version }} files: build/libs/*.jar body: "**${{ github.event.inputs.label }}${{ inputs.hotfix && ' (HOTFIX)' || '' }}**\n" generate_release_notes: true diff --git a/build.gradle.kts b/build.gradle.kts index 2cf0416cb4f..f48ef5a4def 100755 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -160,6 +160,12 @@ task("getVersionFromJavaNoExtra") { commandLine("echo", getVersionFromJavaNoExtra(file("src/main/java/gregtech/GregTechVersion.java"))) } + +// used for GitHub Actions CI releases +task("getVersionFromJava") { + commandLine("echo", getVersionFromJava(file("src/main/java/gregtech/GregTechVersion.java"))) +} + fun getVersionFromJava(file: File): String { var version = getVersionFromJavaNoExtra(file) var extra = ""