From 17b606664b9c392e68cc83df3a12228fd3e7cdb9 Mon Sep 17 00:00:00 2001 From: Dima Date: Sat, 27 Jul 2024 11:00:06 +0300 Subject: [PATCH] fix projectName --- src/ru/pulsar/jenkins/library/steps/EdtValidate.groovy | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/ru/pulsar/jenkins/library/steps/EdtValidate.groovy b/src/ru/pulsar/jenkins/library/steps/EdtValidate.groovy index f766b9e..a0f50a3 100644 --- a/src/ru/pulsar/jenkins/library/steps/EdtValidate.groovy +++ b/src/ru/pulsar/jenkins/library/steps/EdtValidate.groovy @@ -13,7 +13,7 @@ class EdtValidate implements Serializable { public static final String RESULT_STASH = 'edt-validate' public static final String RESULT_FILE = 'build/out/edt-validate.out' - private final JobConfiguration config; + private final JobConfiguration config EdtValidate(JobConfiguration config) { this.config = config @@ -29,16 +29,18 @@ class EdtValidate implements Serializable { return } - def env = steps.env(); + def env = steps.env() String workspaceLocation = "$env.WORKSPACE/$DesignerToEdtFormatTransformation.WORKSPACE" - String projectList; + String projectList if (config.sourceFormat == SourceFormat.DESIGNER) { steps.unstash(DesignerToEdtFormatTransformation.WORKSPACE_ZIP_STASH) steps.unzip(DesignerToEdtFormatTransformation.WORKSPACE, DesignerToEdtFormatTransformation.WORKSPACE_ZIP) - projectList = "--project-name-list $DesignerToEdtFormatTransformation.PROJECT_NAME" + def projectName = config.srcDir.split(File.separator).last() + + projectList = "--project-name-list $projectName" } else { def srcDir = config.srcDir def projectDir = FileUtils.getFilePath("$env.WORKSPACE/$srcDir")