From 9e1b454d1ec6a4c1f39187f71bd83865dc29d78d Mon Sep 17 00:00:00 2001 From: Pieter <51260315+DevPieter@users.noreply.github.com> Date: Thu, 17 Jul 2025 14:56:17 +0200 Subject: [PATCH] Update versioning scheme to include build number for snapshot releases (#14) --- .github/workflows/maven-publish.yml | 2 ++ build.gradle | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 5848e62..6f8729e 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -42,6 +42,7 @@ jobs: run: ./gradlew publish env: SNAPSHOT_BUILD: true + BUILD_NUMBER: ${{ github.run_number }} ORG_GRADLE_PROJECT_mavenRepositoryUrl: ${{ secrets.MAVEN_REPOSITORY_URL_SNAPSHOT }} ORG_GRADLE_PROJECT_mavenRepositoryUsername: ${{ secrets.MAVEN_REPOSITORY_USERNAME_SNAPSHOT }} ORG_GRADLE_PROJECT_mavenRepositoryPassword: ${{ secrets.MAVEN_REPOSITORY_PASSWORD_SNAPSHOT }} @@ -50,6 +51,7 @@ jobs: if: github.ref_name == 'main' run: ./gradlew publish env: + BUILD_NUMBER: ${{ github.run_number }} ORG_GRADLE_PROJECT_mavenRepositoryUrl: ${{ secrets.MAVEN_REPOSITORY_URL_RELEASE }} ORG_GRADLE_PROJECT_mavenRepositoryUsername: ${{ secrets.MAVEN_REPOSITORY_USERNAME_RELEASE }} ORG_GRADLE_PROJECT_mavenRepositoryPassword: ${{ secrets.MAVEN_REPOSITORY_PASSWORD_RELEASE }} diff --git a/build.gradle b/build.gradle index 855e0e0..d14ba6b 100644 --- a/build.gradle +++ b/build.gradle @@ -6,12 +6,12 @@ plugins { def targetJavaVersion = 21 -def hash = System.getenv("GITHUB_SHA")?.substring(0, 7) ?: "dev" def isSnapshot = System.getenv('SNAPSHOT_BUILD')?.toBoolean() ?: false +def buildNumber = System.getenv('BUILD_NUMBER') ?: 'dev' group = maven_group archivesBaseName = archives_base_name -version = "${mod_version}+${minecraft_version}-${max_minecraft_version}" + (isSnapshot ? "-${hash}-SNAPSHOT" : "") +version = "${mod_version}+${minecraft_version}-${max_minecraft_version}" + (isSnapshot ? "-SNAPSHOT+${buildNumber}" : "") repositories { repositories {