Merge branch 'develop' into develop

firstBitMarksistskaya · Feb 20, 2024 · ca6a31e · ca6a31e
2 parents 5088976 + 1a0b5cb
commit ca6a31e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/ru/pulsar/jenkins/library/steps/DesignerToEdtFormatTransformation.groovy b/src/ru/pulsar/jenkins/library/steps/DesignerToEdtFormatTransformation.groovy
@@ -39,7 +39,7 @@ class DesignerToEdtFormatTransformation implements Serializable {
         def configurationRoot = FileUtils.getFilePath("$env.WORKSPACE/$srcDir")
         def edtVersionForRing = EDT.ringModule(config)
 
-        steps.deleteDir(workspaceDir)
+        steps.deleteDir(workspaceDir.getRemote())
 
         Logger.println("Конвертация исходников из формата конфигуратора в формат EDT")
 

diff --git a/src/ru/pulsar/jenkins/library/steps/EdtToDesignerFormatTransformation.groovy b/src/ru/pulsar/jenkins/library/steps/EdtToDesignerFormatTransformation.groovy
@@ -50,7 +50,8 @@ class EdtToDesignerFormatTransformation implements Serializable {
         String extensionRoot = FileUtils.getFilePath("$env.WORKSPACE/$EXTENSION_DIR")
         def edtVersionForRing = EDT.ringModule(config)
 
-        steps.deleteDir(workspaceDir)
+        steps.deleteDir(workspaceDir.getRemote())
+        steps.deleteDir(configurationRoot.getRemote())
 
         transformConfiguration(steps, projectDir, projectWorkspaceDir, configurationRoot, edtVersionForRing)
         transformExtensions(steps, workspaceDir, extensionRoot, edtVersionForRing)