Correct scope of MAXVERSIONNUMBER

This commit is contained in:
Dan Hawkins 2018-11-28 13:10:26 +00:00
commit b06f0855cf
2 changed files with 8 additions and 4 deletions

View file

@ -20,7 +20,7 @@ def combineSubjobArtifacts(meta, subJobs) {
}
}
def versiongenerator = load("${autobuilder.commonscripts()}/versionnumbering/generate.groovy")
revisiontotal = revisiontotal % (versiongenerator.MAXVERSIONNUMBER + 1)
revisiontotal = revisiontotal % (versiongenerator.maxversionnumber() + 1)
return [artifactFolders, revisiontotal]
}

View file

@ -1,4 +1,8 @@
int MAXVERSIONNUMBER = 65535
def int maxversionnumber() {
def int MAXVERSIONNUMBER = 65535
return MAXVERSIONNUMBER
}
def getGitRevision(String gitrootpath, int basebuildnumber) {
def int adjustedchangecount
@ -8,7 +12,7 @@ def getGitRevision(String gitrootpath, int basebuildnumber) {
dir( gitrootpath) {
def int changecount = sh(returnStdout: true, script: "git rev-list HEAD --count").trim()
echo "Change count: ${changecount}"
adjustedchangecount = (changecount + basebuildnumber) % (MAXVERSIONNUMBER + 1)
adjustedchangecount = (changecount + basebuildnumber) % (maxversionnumber() + 1)
echo "Adjusted change count: ${adjustedchangecount}"
gitrevision = sh(returnStdout: true, script: "git rev-parse HEAD").trim()
@ -62,7 +66,7 @@ def getVersionPrefix(String sourcebranch) {
def integers = []
for (integerstring in integerstrings) {
int integer = integerstring.toInteger()
integer = integer % (MAXVERSIONNUMBER + 1)
integer = integer % (maxversionnumber() + 1)
integers.add(integer)
}