diff --git a/build.gradle b/build.gradle index 07a45ab..8b9b895 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ sourceCompatibility = '17' targetCompatibility = '17' archivesBaseName = project.archives_base_name -version = "${project.mod_version}${getVersionMetadata()}" +version = "${project.mod_version}+${getMetadata()}" group = project.maven_group repositories { @@ -68,16 +68,10 @@ jar { } } -def getVersionMetadata() { +def getMetadata() { def build_id = System.getenv("GITHUB_RUN_NUMBER") - def workflow_id = System.getenv("GITHUB_WORKFLOW") - // CI builds only - if (workflow_id == "build-release") { - return "+${project.minecraft_version}" - } else if (build_id != null) { - return "+build.${build_id}" - } + def metadata = project.minecraft_version if (grgit != null) { def head = grgit.head() @@ -88,6 +82,13 @@ def getVersionMetadata() { id += "-dirty" } - return "+rev.${id}" + metadata += "-${id}" } + + // CI builds only + if (build_id != null) { + metadata += ".${build_id}" + } + + return metadata } diff --git a/gradle.properties b/gradle.properties index 465959e..e5e5c66 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,14 +4,14 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://modmuss50.me/fabric.html minecraft_version=1.18.1 -yarn_mappings=1.18.1+build.18 +yarn_mappings=1.18.1+build.22 loader_version=0.12.12 -fabric_version=0.46.0+1.18 +fabric_version=0.46.2+1.18 # Mod Properties -mod_version=1.0.0 +mod_version=1.0.1 maven_group=me.tibinonest.mods -archives_base_name=cauldron-dying +archives_base_name=cauldron-dyeing # Dependencies sodium_version=mc1.18.1-0.4.0-alpha6