From 8547a885125a55134fbc7d93207ddb8f35833b8b Mon Sep 17 00:00:00 2001 From: Raven Szewczyk Date: Sat, 15 Jul 2023 09:26:57 +0100 Subject: [PATCH] Update buildscript --- build.gradle | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 35dd43ef..bd6289cf 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -//version: 1689101527 +//version: 1689409577 /* DO NOT CHANGE THIS FILE! Also, you may replace this file at any time if there is an update available. @@ -363,9 +363,12 @@ try { if (versionOverride == null) { def gitDetails = versionDetails() def isDirty = gitVersion().endsWith(".dirty") // No public API for this, isCleanTag has a different meaning - String branchName = gitDetails.branchName + String branchName = gitDetails.branchName ?: (System.getenv('GIT_BRANCH') ?: 'git') + if (branchName.startsWith('origin/')) { + branchName = branchName.minus('origin/') + } branchName = branchName.replaceAll("[^a-zA-Z0-9-]+", "-") // sanitize branch names for semver - identifiedVersion = gitDetails.lastTag + identifiedVersion = gitDetails.lastTag ?: '${gitDetails.gitHash}' if (gitDetails.commitDistance > 0) { identifiedVersion += "-${branchName}.${gitDetails.commitDistance}+${gitDetails.gitHash}" if (isDirty) {