From 202ba71857c9c847d886853fbe079c08ab120dcd Mon Sep 17 00:00:00 2001 From: tibs <37983572+TibiNonEst@users.noreply.github.com> Date: Tue, 29 Mar 2022 00:19:32 -0400 Subject: [PATCH] Redo versioning --- build.gradle | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 374bc56..42d23c0 100644 --- a/build.gradle +++ b/build.gradle @@ -72,10 +72,18 @@ jar { def getMetadata() { def build_id = System.getenv("GITHUB_RUN_NUMBER") + def workflow_id = System.getenv("GITHUB_WORKFLOW") def metadata = project.minecraft_version - if (grgit != null) { + // Release builds only + if (workflow_id == "build-release") { + return metadata + } + + if (build_id != null) { + metadata += "-build.${build_id}" + } else if (grgit != null) { def head = grgit.head() def id = head.abbreviatedId @@ -87,10 +95,5 @@ def getMetadata() { metadata += "-${id}" } - // CI builds only - if (build_id != null) { - metadata += ".${build_id}" - } - return metadata }