From 85aebfbd8b0608fe030c77e231b71863e0e9f6eb Mon Sep 17 00:00:00 2001 From: kennethpi Date: Mon, 20 Jan 2025 14:33:39 +0100 Subject: [PATCH] Correction in tag calculation --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 4cd593ec..cfedc313 100644 --- a/build.gradle +++ b/build.gradle @@ -34,7 +34,7 @@ def calcTags(version) { tags += "${version.major}.${version.minor}.${version.rev}.${version.label}".toString() } // For non-master/non-release builds, change the tags to contain branch and build number - def isReleaseBuild = ci.isCi() && (ci.branch != null && (ci.branch.startsWith("master") || ci.branch.startsWith("release")) || ci.tag != null) + def isReleaseBuild = ci.isCi() && ((ci.branch != null && (ci.branch.startsWith("master") || ci.branch.startsWith("release"))) || ci.tag != null) if (!isReleaseBuild) { def branch = ci.tag ? ci.tag : ci.branch ? ci.branch.replace("/", ".") : "1.0.0" tags = tags.stream().map({ it + "-build-${branch}-${ci.buildNumber}" }).collect(Collectors.toList())