jenkins/jenkins-lib
1
0
Fork 1
mirror of https://github.com/firstBitMarksistskaya/jenkins-lib.git synced 2025-01-22 12:12:53 +02:00
Code Issues Releases Activity

Добавлено использование параметра edtVersion в шагах EdtValidate и EdtToDesignerFormatTransformation

Browse Source
This commit is contained in:
ivanmolodec 2022-05-13 23:14:19 +03:00
parent e8097451a3
commit a996536981
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/ru/pulsar/jenkins/library/steps/EdtToDesignerFormatTransformation.groovy
View File

@ -43,7 +43,12 @@ class EdtToDesignerFormatTransformation implements Serializable {
Logger.println("Конвертация исходников из формата EDT в формат Конфигуратора")
def ringCommand = "ring edt workspace export --workspace-location \"$workspaceDir\" --project \"$projectDir\" --configuration-files \"$configurationRoot\""
String edtVersion = "edt"
if (config.edtVersion != '') {
edtVersion += "@" + config.edtVersion
}
def ringCommand = "ring $edtVersion workspace export --workspace-location \"$workspaceDir\" --project \"$projectDir\" --configuration-files \"$configurationRoot\""
def ringOpts = [Constants.DEFAULT_RING_OPTS]
steps.withEnv(ringOpts) {

7
src/ru/pulsar/jenkins/library/steps/EdtValidate.groovy
View File

@ -47,7 +47,12 @@ class EdtValidate implements Serializable {
Logger.println("Выполнение валидации EDT")
def ringCommand = "ring edt workspace validate --workspace-location \"$workspaceLocation\" --file \"$resultFile\" $projectList"
String edtVersion = "edt"
if (config.edtVersion != '') {
edtVersion += "@" + config.edtVersion
}
def ringCommand = "ring $edtVersion workspace validate --workspace-location \"$workspaceLocation\" --file \"$resultFile\" $projectList"
def ringOpts = [Constants.DEFAULT_RING_OPTS]
steps.withEnv(ringOpts) {
steps.catchError {