krak/jenkins-lib
1
0
Fork 0
forked from jenkins/jenkins-lib
Code Activity

Исправление определение формата исходников

Browse Source
This commit is contained in:
Nikita Gryzlov
2021-11-01 18:19:38 +03:00
parent f8020afa68
commit 648d33598f
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/ru/pulsar/jenkins/library/steps/SonarScanner.groovy
View File

@@ -2,6 +2,7 @@ package ru.pulsar.jenkins.library.steps
import ru.pulsar.jenkins.library.IStepExecutor
import ru.pulsar.jenkins.library.configuration.JobConfiguration
import ru.pulsar.jenkins.library.configuration.SourceFormat
import ru.pulsar.jenkins.library.ioc.ContextRegistry
import ru.pulsar.jenkins.library.utils.Logger
import ru.pulsar.jenkins.library.utils.VersionParser
@@ -13,7 +14,7 @@ class SonarScanner implements Serializable {
SonarScanner(JobConfiguration config) {
this.config = config
if (config.sourceFormat.EDT){
if (config.sourceFormat == SourceFormat.EDT){
this.rootFile = "$config.srcDir/src/Configuration/Configuration.mdo"
} else {
this.rootFile = "$config.srcDir/Configuration.xml"
@@ -43,10 +44,10 @@ class SonarScanner implements Serializable {
String sonarCommand = "$sonarScannerBinary -Dsonar.branch.name=$env.BRANCH_NAME"
String configurationVersion = ""
if (config.sourceFormat.EDT) {
String configurationVersion
if (config.sourceFormat == SourceFormat.EDT) {
configurationVersion = VersionParser.edt(rootFile)
}else {
} else {
configurationVersion = VersionParser.configuration(rootFile)
}