1
0
mirror of https://github.com/firstBitMarksistskaya/jenkins-lib.git synced 2025-08-25 20:09:25 +02:00

fix paths

This commit is contained in:
Dima
2024-07-28 11:28:05 +03:00
parent accc8e8559
commit dd5f568f44
3 changed files with 9 additions and 5 deletions

View File

@@ -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)

View File

@@ -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 {

View File

@@ -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")