fix paths

firstBitMarksistskaya · Jul 28, 2024 · dd5f568 · dd5f568
1 parent accc8e8
commit dd5f568
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/src/ru/pulsar/jenkins/library/steps/DesignerToEdtFormatTransformation.groovy b/src/ru/pulsar/jenkins/library/steps/DesignerToEdtFormatTransformation.groovy
@@ -35,7 +35,7 @@ class DesignerToEdtFormatTransformation implements Serializable {
         def workspaceDir = FileUtils.getFilePath("$env.WORKSPACE/$WORKSPACE")
         def srcDir = config.srcDir
         def configurationRoot = FileUtils.getFilePath("$env.WORKSPACE/$srcDir")
-        def projectName = config.srcDir.split(File.separator).last()
+        def projectName = configurationRoot.getName()
         def edtVersionForRing = EDT.ringModule(config)
 
         steps.deleteDir(workspaceDir)

diff --git a/src/ru/pulsar/jenkins/library/steps/EdtValidate.groovy b/src/ru/pulsar/jenkins/library/steps/EdtValidate.groovy
@@ -38,7 +38,10 @@ class EdtValidate implements Serializable {
             steps.unstash(DesignerToEdtFormatTransformation.WORKSPACE_ZIP_STASH)
             steps.unzip(DesignerToEdtFormatTransformation.WORKSPACE, DesignerToEdtFormatTransformation.WORKSPACE_ZIP)
 
-            def projectName = config.srcDir.split(File.separator).last()
+            def srcDir = config.srcDir
+            def configurationRoot = FileUtils.getFilePath("$env.WORKSPACE/$srcDir")
+
+            def projectName = configurationRoot.getName()
 
             projectList = "--project-name-list $projectName"
         } else {

diff --git a/src/ru/pulsar/jenkins/library/steps/ResultsTransformer.groovy b/src/ru/pulsar/jenkins/library/steps/ResultsTransformer.groovy
@@ -63,9 +63,10 @@ class ResultsTransformer implements Serializable {
 
             }
 
-            def splitDir = config.srcDir.split(File.separator)
-            def projectName = splitDir.last()
-            def srcDirExceptLast = splitDir.dropRight(1).join(File.separator)
+            srcDir = FileUtils.getFilePath("$env.WORKSPACE/$config.srcDir")
+
+            def projectName = srcDir.getName()
+            def srcDirExceptLast = srcDir.getParent()
 
             steps.cmd("edt-ripper parse $edtValidateFile $srcDirExceptLast $projectName $env.WORKSPACE/$RESULT_FILE")