From 9246812fbfa9185db78e1b67b8aa3ee0b9fdb84f Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Thu, 2 Dec 2021 22:27:44 +0000 Subject: [PATCH] Handle pre-generated buildnumber --- versionnumbering/generate.groovy | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/versionnumbering/generate.groovy b/versionnumbering/generate.groovy index c3e1837..7b435c4 100644 --- a/versionnumbering/generate.groovy +++ b/versionnumbering/generate.groovy @@ -155,16 +155,7 @@ String generate(meta, String sourcerevision, String sourcepath, int basebuildnum } String pregenerated(meta, String sourcerevision, String sourcepath, String pregeneratedbuildstamp, int basebuildnumber = 1000) { - def int gitrevisioncount - def String gitrevision - def String remoteinfo - def String remoteurl - - (gitrevisioncount, gitrevision, remoteinfo, remoteurl) = getGitRevision(sourcepath, basebuildnumber) - - echo "Build stamp is: ${pregeneratedbuildstamp}" - - meta.gitinfo.set(sourcepath, sourcerevision, gitrevision, remoteurl, remoteinfo) + generate(meta, sourcerevision, sourcepath, basebuildnumber) meta.buildstampinfo.override(pregeneratedbuildstamp) return pregeneratedbuildstamp