From ec03278f057425560fc5c444b037ad9e1073709f Mon Sep 17 00:00:00 2001 From: Nikita Gryzlov Date: Tue, 2 Nov 2021 18:05:04 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BE=D0=B1=D1=80=D0=B0=D1=89=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D0=BA=20SourceFormat?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + .../library/steps/EdtToDesignerFormatTransformation.groovy | 3 ++- vars/pipeline1C.groovy | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) 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