fix

firstBitMarksistskaya · Nov 10, 2024 · 83ee97f · 83ee97f
1 parent 5af9ba1
commit 83ee97f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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()