From 727be2da189f8836419803dc6b14ceda0dd2174b Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Wed, 23 Mar 2022 18:38:25 +0000 Subject: [PATCH] Use the autobuild script revision count to alter the version --- versionnumbering/generate.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/versionnumbering/generate.groovy b/versionnumbering/generate.groovy index 9db65ac..6cec569 100644 --- a/versionnumbering/generate.groovy +++ b/versionnumbering/generate.groovy @@ -11,7 +11,7 @@ int incrementrevision(int current, int increment) { return newrevision } -def getGitRevision(String gitrootpath, int basebuildnumber) { +def getGitRevision(String gitrootpath, int basebuildnumber = 0) { def int adjustedchangecount def String gitrevision def String remoteinfo @@ -146,7 +146,7 @@ String generate(meta, String sourcerevision, String sourcepath, int basebuildnum (gitrevisioncount, gitrevision, remoteinfo, remoteurl) = getGitRevision(sourcepath, basebuildnumber) - (scriptgitrevisioncount, scriptgitrevision, scriptremoteinfo, scriptremoteurl) = getGitRevision(autobuilder, 0) + (scriptgitrevisioncount, scriptgitrevision, scriptremoteinfo, scriptremoteurl) = getGitRevision(autobuilder) def int totalrevisioncount = incrementrevision(gitrevisioncount, scriptgitrevisioncount)