From f61fedf9f2ee8e81084d051131fcb429107f1a7b Mon Sep 17 00:00:00 2001 From: Raven Szewczyk Date: Sat, 15 Jul 2023 09:26:04 +0100 Subject: [PATCH] Fix a NPE when checking the version in releases/jenkins (#199) * Fix a NPE when checking the version in releases/jenkins * Be safe with the last tag too * Nicer text for missing branch info on Jenkins * Try GIT_LOCAL_BRANCH from the jenkins git plugin before giving up * Use the working Jenkins env variable --- build.gradle | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 35dd43e..320f59e 100644 --- a/build.gradle +++ b/build.gradle @@ -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) {