From fba4aa31ab96fca27597839f566e239c52466e7b Mon Sep 17 00:00:00 2001 From: Eclipse Date: Thu, 23 Oct 2025 10:37:01 +0000 Subject: [PATCH] Add build number to version in FMJ --- .github/workflows/build.yml | 1 + .../src/main/kotlin/rainbow.base-conventions.gradle.kts | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3301e79..cf9095f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -37,6 +37,7 @@ jobs: if: ${{ success() && github.repository == 'GeyserMC/Rainbow' && github.ref_name == 'master' }} run: ./gradlew publish env: + BUILD_NUMBER: ${{ steps.release-info.outputs.curentRelease }} ORG_GRADLE_PROJECT_geysermcUsername: ${{ vars.DEPLOY_USER }} ORG_GRADLE_PROJECT_geysermcPassword: ${{ secrets.DEPLOY_PASS }} diff --git a/build-logic/src/main/kotlin/rainbow.base-conventions.gradle.kts b/build-logic/src/main/kotlin/rainbow.base-conventions.gradle.kts index 8717da3..84a478c 100644 --- a/build-logic/src/main/kotlin/rainbow.base-conventions.gradle.kts +++ b/build-logic/src/main/kotlin/rainbow.base-conventions.gradle.kts @@ -8,6 +8,9 @@ group = properties["maven_group"]!! as String val archivesBaseName = properties["archives_base_name"]!! as String val targetJavaVersion = 21 +val buildNumber = System.getenv()["BUILD_NUMBER"]?: "DEV" +val fmjVersion = "$version-$buildNumber" + base { archivesName = archivesBaseName } @@ -42,7 +45,7 @@ dependencies { tasks { processResources { - inputs.property("version", version) + inputs.property("version", fmjVersion) inputs.property("supported_versions", libs.versions.minecraft.supported.get()) inputs.property("loader_version", libs.versions.fabric.loader.get()) filteringCharset = "UTF-8" @@ -50,7 +53,7 @@ tasks { filesMatching("fabric.mod.json") { expand( mapOf( - "version" to version, + "version" to fmjVersion, "supported_versions" to libs.versions.minecraft.supported.get(), "loader_version" to libs.versions.fabric.loader.get() )