From 72b9510fecacfdca6b2470826fb17788450b75a6 Mon Sep 17 00:00:00 2001
From: ivanmolodec <ivssmirnov@1bit.com>
Date: Fri, 13 May 2022 22:29:07 +0300
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=20=D0=BF=D0=B0=D1=80=D0=B0=D0=BC=D0=B5=D1=82=D1=80=20edt?=
 =?UTF-8?q?Version=20=D0=B2=20=D1=81=D1=85=D0=B5=D0=BC=D1=83.=20=D0=94?=
 =?UTF-8?q?=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=BE=20=D0=B8=D1=81?=
 =?UTF-8?q?=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B5=20=D0=BF=D0=B0=D1=80=D0=B0=D0=BC=D0=B5=D1=82=D1=80=D0=B0?=
 =?UTF-8?q?=20=D0=B2=20=D1=88=D0=B0=D0=B3=D0=B5=20DesignerToEdtFormatTrans?=
 =?UTF-8?q?formation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/globalConfiguration.json                         | 1 +
 resources/schema.json                                      | 4 ++++
 .../jenkins/library/configuration/JobConfiguration.groovy  | 4 ++++
 .../library/steps/DesignerToEdtFormatTransformation.groovy | 7 ++++++-
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/resources/globalConfiguration.json b/resources/globalConfiguration.json
index b68db16..8de4eee 100644
--- a/resources/globalConfiguration.json
+++ b/resources/globalConfiguration.json
@@ -1,6 +1,7 @@
 {
   "$schema": "schema.json",
   "v8version": "8.3",
+  "edtVersion": "",
   "srcDir": "src/cf",
   "sourceFormat": "designer",
   "defaultBranch": "main",
diff --git a/resources/schema.json b/resources/schema.json
index f94f575..f796d0d 100644
--- a/resources/schema.json
+++ b/resources/schema.json
@@ -6,6 +6,10 @@
       "type" : "string",
       "description" : "Версия платформы 1С:Предприятие в формате 8.3.хх.хххх."
     },
+    "edtVersion" : {
+      "type" : "string",
+      "description" : "Версия модуля 1C:Enterprise Development Tools формате xxxx.x.x:x86_64"
+    },
     "srcDir" : {
       "type" : "string",
       "description" : "Путь к корневому каталогу с исходниками конфигурации, в случае хранения исходников в формате EDT, необходимо указать путь к проекту"
diff --git a/src/ru/pulsar/jenkins/library/configuration/JobConfiguration.groovy b/src/ru/pulsar/jenkins/library/configuration/JobConfiguration.groovy
index 82b148a..3fcaa6c 100644
--- a/src/ru/pulsar/jenkins/library/configuration/JobConfiguration.groovy
+++ b/src/ru/pulsar/jenkins/library/configuration/JobConfiguration.groovy
@@ -12,6 +12,9 @@ class JobConfiguration implements Serializable {
     @JsonPropertyDescription("Версия платформы 1С:Предприятие в формате 8.3.хх.хххх.")
     String v8version
 
+    @JsonPropertyDescription("Версия модуля 1C:Enterprise Development Tools формате xxxx.x.x:x86_64")
+    String edtVersion
+
     @JsonPropertyDescription("Путь к корневому каталогу с исходниками конфигурации, в случае хранения исходников в формате EDT, необходимо указать путь к проекту")
     String srcDir
 
@@ -65,6 +68,7 @@ class JobConfiguration implements Serializable {
     String toString() {
         return "JobConfiguration{" +
             "v8version='" + v8version + '\'' +
+            ", edtVersion='" + edtVersion + '\'' +
             ", srcDir='" + srcDir + '\'' +
             ", sourceFormat=" + sourceFormat +
             ", stageFlags=" + stageFlags +
diff --git a/src/ru/pulsar/jenkins/library/steps/DesignerToEdtFormatTransformation.groovy b/src/ru/pulsar/jenkins/library/steps/DesignerToEdtFormatTransformation.groovy
index e62a336..f682183 100644
--- a/src/ru/pulsar/jenkins/library/steps/DesignerToEdtFormatTransformation.groovy
+++ b/src/ru/pulsar/jenkins/library/steps/DesignerToEdtFormatTransformation.groovy
@@ -39,7 +39,12 @@ class DesignerToEdtFormatTransformation implements Serializable {
 
         Logger.println("Конвертация исходников из формата конфигуратора в формат EDT")
 
-        def ringCommand = "ring edt workspace import --configuration-files \"$configurationRoot\" --project-name $PROJECT_NAME --workspace-location \"$workspaceDir\""
+        String edtVersion = "edt"
+        if (config.edtVersion != '') {
+            edtVersion += "@" + config.edtVersion
+        }
+
+        def ringCommand = "ring $edtVersion workspace import --configuration-files \"$configurationRoot\" --project-name $PROJECT_NAME --workspace-location \"$workspaceDir\""
 
         def ringOpts = [Constants.DEFAULT_RING_OPTS]
         steps.withEnv(ringOpts) {