diff --git a/.gitignore b/.gitignore index f58cab4..5f3fff7 100644 --- a/.gitignore +++ b/.gitignore @@ -2,5 +2,6 @@ .gradle/ build/ bin/ +lib/ *.iml diff --git a/src/ru/pulsar/jenkins/library/steps/EdtToDesignerFormatTransformation.groovy b/src/ru/pulsar/jenkins/library/steps/EdtToDesignerFormatTransformation.groovy index 7d3b7bd..365ac92 100644 --- a/src/ru/pulsar/jenkins/library/steps/EdtToDesignerFormatTransformation.groovy +++ b/src/ru/pulsar/jenkins/library/steps/EdtToDesignerFormatTransformation.groovy @@ -3,6 +3,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.Constants import ru.pulsar.jenkins.library.utils.Logger @@ -25,7 +26,7 @@ class EdtToDesignerFormatTransformation implements Serializable { Logger.printLocation() - if (!config.sourceFormat.EDT) { + if (config.sourceFormat != SourceFormat.EDT) { Logger.println("SRC is not in EDT format. No transform is needed.") return } diff --git a/vars/pipeline1C.groovy b/vars/pipeline1C.groovy index c0372ab..6aed2b6 100644 --- a/vars/pipeline1C.groovy +++ b/vars/pipeline1C.groovy @@ -111,7 +111,7 @@ void call() { } when { beforeAgent true - expression { config.sourceFormat.DESIGNER && config.stageFlags.edtValidate} + expression { config.sourceFormat == SourceFormat.DESIGNER && config.stageFlags.edtValidate} } steps { designerToEdtFormatTransformation config