Merge commit '9db0cfef8728f1a64f3ad482b4ace56c325274ba'

This commit is contained in:
Dan Hawkins 2020-04-07 15:52:23 +01:00
commit 54c91b3946
4 changed files with 4 additions and 4 deletions

View file

@ -54,7 +54,7 @@ pipeline {
steps {
script {
version = load("${autobuilder.commonscripts()}/versionnumbering/generate.groovy")
version.generate(meta, SOURCE_REVISION, SOURCE_PATH, BASEBUILDNUMBER)
version.generate(meta, SOURCE_REVISION, SOURCE_PATH)
}
}
}

View file

@ -73,7 +73,7 @@ pipeline {
steps {
script {
version = load("${autobuilder.commonscripts()}/versionnumbering/generate.groovy")
version.generate(meta, SOURCE_REVISION, SOURCE_PATH, BASEBUILDNUMBER)
version.generate(meta, SOURCE_REVISION, SOURCE_PATH)
}
}
}

View file

@ -48,7 +48,7 @@ pipeline {
steps {
script {
version = load("${autobuilder.commonscripts()}/versionnumbering/generate.groovy")
version.generate(meta, SOURCE_REVISION, SOURCE_PATH, BASEBUILDNUMBER)
version.generate(meta, SOURCE_REVISION, SOURCE_PATH)
}
}
}

View file

@ -1,5 +1,5 @@
def substitute(String filepath, String pattern, String subst) {
def substitute(String filepath, pattern, String subst) {
fileText = readFile(file: filepath, encoding: 'UTF-8')
def converted = fileText.replaceAll(pattern, subst)
writeFile(file: filepath, text: converted, encoding: 'UTF-8')