1
0
mirror of https://github.com/firstBitMarksistskaya/jenkins-lib.git synced 2025-02-12 14:57:15 +02:00

Доработал определение версии, когда исходники в формате EDT

This commit is contained in:
kuzja086 2021-08-20 14:43:56 +05:00
parent 5f7a1d280f
commit c9bc42def8
3 changed files with 19 additions and 4 deletions

View File

@ -9,7 +9,7 @@ import ru.pulsar.jenkins.library.utils.VersionParser
class SonarScanner implements Serializable {
private final JobConfiguration config;
private final String rootFile
private String rootFile
SonarScanner(JobConfiguration config) {
this.config = config
@ -39,7 +39,14 @@ class SonarScanner implements Serializable {
String sonarCommand = "$sonarScannerBinary -Dsonar.branch.name=$env.BRANCH_NAME"
String configurationVersion = VersionParser.configuration(rootFile)
String configurationVersion = ""
if (config.stageFlags.srcEDT) {
rootFile = "$config.srcDir/Configuration/Configuration.mdo"
configurationVersion = VersionParser.edt(rootFile)
}else {
configurationVersion = VersionParser.configuration(rootFile)
}
if (configurationVersion) {
sonarCommand += " -Dsonar.projectVersion=$configurationVersion"
}

View File

@ -30,4 +30,12 @@ class VersionParser implements Serializable {
return matcher != null && matcher.getCount() == 1 ? matcher[0][1] : ""
}
static String edt(rootFile = 'src/Configuration/Configuration.mdo') {
IStepExecutor steps = ContextRegistry.getContext().getStepExecutor()
def configurationText = steps.readFile(rootFile, 'UTF-8');
return version(configurationText, VERSION_REGEXP)
}
}

View File

@ -59,7 +59,7 @@ void call() {
}
steps {
script{
edtBackTransform config
// edtBackTransform config
}
}
}
@ -75,7 +75,7 @@ void call() {
if (config.stageFlags.infobaseFromFiles()){
// Создание базы загрузкой из файлов
initFromFiles config
// initFromFiles config
}
else{
// Создание базы загрузкой конфигурации из хранилища