From 3529316fdd6c437f38a7632d0f28b481181dc416 Mon Sep 17 00:00:00 2001
From: Primakov Alexandr Alexandrovich <primakov.pro@yandex.ru>
Date: Mon, 5 Aug 2024 22:35:43 +0300
Subject: [PATCH] fix predeploy no tag error

---
 predeploy/Jenkinsfile | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/predeploy/Jenkinsfile b/predeploy/Jenkinsfile
index e06fe28..0cbb632 100644
--- a/predeploy/Jenkinsfile
+++ b/predeploy/Jenkinsfile
@@ -36,8 +36,6 @@ stage ('predeploy') {
     echo 'checking tag'
     script {
         tag = tagModule.calcTag()
-        echo "tag is -> ${tag}"
-        println "tagNoV is -> ${tagModule.getTagNoV()}"
         def branchName = sh(returnStdout: true, script: "git rev-parse --abbrev-ref HEAD").trim()
 
         if (tag) {
@@ -53,12 +51,12 @@ stage ('predeploy') {
             echo 'tag not found'
             addBadge(
               icon: 'info.gif',
-              text: "Сборка в master")
+              text: "Сборка в ${branchName}")
             // sh "cd ${TARGET_FOLDER}; echo '${branchName}' > ${DEPLOY_VERSION_VAR}"
             sh "mkdir ${branchName}"
             sh "mv ${TARGET_FOLDER}/* ${branchName}"
             // sh "cd ${TARGET_FOLDER} ; echo 'rm ${DEPLOY_VERSION_VAR}' > ${DEPLOY_VERSION_VAR}"
-            archiveArtifacts artifacts: "${TARGET_FOLDER}/*/**"
+            archiveArtifacts artifacts: "${branchName}/*/**"
         }
     }
 }