From 83ee97f9741c1045e592d633cebabd46db33a6d7 Mon Sep 17 00:00:00 2001 From: Dima Date: Sun, 10 Nov 2024 18:16:36 +0300 Subject: [PATCH] fix --- .../pulsar/jenkins/library/edt/NativeEdtCliConverter.groovy | 6 +++--- src/ru/pulsar/jenkins/library/edt/RingConverter.groovy | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ru/pulsar/jenkins/library/edt/NativeEdtCliConverter.groovy b/src/ru/pulsar/jenkins/library/edt/NativeEdtCliConverter.groovy index 10869a80..fa090ca3 100644 --- a/src/ru/pulsar/jenkins/library/edt/NativeEdtCliConverter.groovy +++ b/src/ru/pulsar/jenkins/library/edt/NativeEdtCliConverter.groovy @@ -14,7 +14,7 @@ class NativeEdtCliConverter implements IEdtCliEngine { @Override void edtToDesignerTransformConfiguration(IStepExecutor steps, JobConfiguration config) { - String workspaceDir = FileUtils.getFilePath("$env.WORKSPACE/$WORKSPACE").getRemote() + String workspaceDir = FileUtils.getFilePath("$env.WORKSPACE/$EdtToDesignerFormatTransformation.WORKSPACE").getRemote() String projectWorkspaceDir = FileUtils.getFilePath("$workspaceDir/cf").getRemote() String configurationRoot = FileUtils.getFilePath("$env.WORKSPACE/$EdtToDesignerFormatTransformation.CONFIGURATION_DIR").getRemote() @@ -34,7 +34,7 @@ class NativeEdtCliConverter implements IEdtCliEngine { def env = steps.env() - String workspaceDir = FileUtils.getFilePath("$env.WORKSPACE/$WORKSPACE").getRemote() + String workspaceDir = FileUtils.getFilePath("$env.WORKSPACE/$EdtToDesignerFormatTransformation.WORKSPACE").getRemote() String extensionRoot = FileUtils.getFilePath("$env.WORKSPACE/$EdtToDesignerFormatTransformation.EXTENSION_DIR").getRemote() config.initInfoBaseOptions.extensions.each { @@ -59,7 +59,7 @@ class NativeEdtCliConverter implements IEdtCliEngine { def env = steps.env() - def workspaceDir = FileUtils.getFilePath("$env.WORKSPACE/$WORKSPACE") + def workspaceDir = FileUtils.getFilePath("$env.WORKSPACE/$DesignerToEdtFormatTransformation.WORKSPACE") def srcDir = config.srcDir def configurationRoot = FileUtils.getFilePath("$env.WORKSPACE/$srcDir") def projectName = configurationRoot.getName() diff --git a/src/ru/pulsar/jenkins/library/edt/RingConverter.groovy b/src/ru/pulsar/jenkins/library/edt/RingConverter.groovy index 967a567a..b0abb17f 100644 --- a/src/ru/pulsar/jenkins/library/edt/RingConverter.groovy +++ b/src/ru/pulsar/jenkins/library/edt/RingConverter.groovy @@ -19,7 +19,7 @@ class RingConverter implements IEdtCliEngine { def edtVersionForRing = EDT.ringModule(config) def srcDir = config.srcDir - String workspaceDir = FileUtils.getFilePath("$env.WORKSPACE/$WORKSPACE").getRemote() + String workspaceDir = FileUtils.getFilePath("$env.WORKSPACE/$EdtToDesignerFormatTransformation.WORKSPACE").getRemote() String projectWorkspaceDir = FileUtils.getFilePath("$workspaceDir/cf").getRemote() String projectDir = FileUtils.getFilePath("$env.WORKSPACE/$srcDir").getRemote() String configurationRoot = FileUtils.getFilePath("$env.WORKSPACE/$EdtToDesignerFormatTransformation.CONFIGURATION_DIR").getRemote() @@ -38,7 +38,7 @@ class RingConverter implements IEdtCliEngine { def env = steps.env() - String workspaceDir = FileUtils.getFilePath("$env.WORKSPACE/$WORKSPACE").getRemote() + String workspaceDir = FileUtils.getFilePath("$env.WORKSPACE/$EdtToDesignerFormatTransformation.WORKSPACE").getRemote() def edtVersionForRing = EDT.ringModule(config) String extensionRoot = FileUtils.getFilePath("$env.WORKSPACE/$EdtToDesignerFormatTransformation.EXTENSION_DIR").getRemote() @@ -63,7 +63,7 @@ class RingConverter implements IEdtCliEngine { def env = steps.env() - def workspaceDir = FileUtils.getFilePath("$env.WORKSPACE/$WORKSPACE") + def workspaceDir = FileUtils.getFilePath("$env.WORKSPACE/$DesignerToEdtFormatTransformation.WORKSPACE") def srcDir = config.srcDir def configurationRoot = FileUtils.getFilePath("$env.WORKSPACE/$srcDir") def projectName = configurationRoot.getName()