From 6ffb9382580caf6df500cb63345c3169322ad2d8 Mon Sep 17 00:00:00 2001
From: kuzja086 <51016001+kuzja086@users.noreply.github.com>
Date: Wed, 17 Nov 2021 10:48:06 +0500
Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=BE=D1=80=D0=BC=D0=B0=D1=82=20EDT=20?=
 =?UTF-8?q?=D0=B1=D0=BB=D0=BE=D0=BA=D0=B8=D1=80=D1=83=D0=B5=D1=82=20=D0=B2?=
 =?UTF-8?q?=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD=D0=BE=D1=81=D1=82=D1=8C=20?=
 =?UTF-8?q?=D0=B8=D0=BD=D0=B8=D1=86=D0=B8=D0=B0=D0=BB=D0=B8=D0=B7=D0=B0?=
 =?UTF-8?q?=D1=86=D0=B8=D0=B8=20=D0=98=D0=91=20=D0=B8=D0=B7=20=D1=85=D1=80?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D0=BB=D0=B8=D1=89=D0=B0=20(#51)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: kuzja086 <kozs@tlink.ru>
---
 resources/schema.json                                          | 2 +-
 .../jenkins/library/configuration/JobConfiguration.groovy      | 3 +--
 vars/pipeline1C.groovy                                         | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/resources/schema.json b/resources/schema.json
index cbd7157..0532694 100644
--- a/resources/schema.json
+++ b/resources/schema.json
@@ -17,7 +17,7 @@
     },
     "defaultBranch" : {
       "type" : "string",
-      "description" : "Имя ветки по умолчанию"
+      "description" : "Имя ветки по умолчанию. Значение по умолчанию - main."
     },
     "secrets" : {
       "type" : "object",
diff --git a/src/ru/pulsar/jenkins/library/configuration/JobConfiguration.groovy b/src/ru/pulsar/jenkins/library/configuration/JobConfiguration.groovy
index f623035..4689a6f 100644
--- a/src/ru/pulsar/jenkins/library/configuration/JobConfiguration.groovy
+++ b/src/ru/pulsar/jenkins/library/configuration/JobConfiguration.groovy
@@ -78,8 +78,7 @@ class JobConfiguration implements Serializable {
         String branchName = env.BRANCH_NAME;
         def initMethod = initInfobaseOptions.initMethod
 
-        return sourceFormat == SourceFormat.EDT ||
-            (initMethod == InitInfobaseMethod.FROM_SOURCE) ||
+        return (initMethod == InitInfobaseMethod.FROM_SOURCE) ||
             (initMethod == InitInfobaseMethod.DEFAULT_BRANCH_FROM_STORAGE && branchName != defaultBranch)
     }
 }
\ No newline at end of file
diff --git a/vars/pipeline1C.groovy b/vars/pipeline1C.groovy
index 7f5222d..efab2c4 100644
--- a/vars/pipeline1C.groovy
+++ b/vars/pipeline1C.groovy
@@ -56,7 +56,7 @@ void call() {
                                 }
                                 when {
                                     beforeAgent true
-                                    expression { config.stageFlags.needInfobase() && config.sourceFormat == SourceFormat.EDT }
+                                    expression { config.stageFlags.needInfobase() && config.infobaseFromFiles() && config.sourceFormat == SourceFormat.EDT }
                                 }
                                 steps {
                                     edtToDesignerFormatTransformation config