fix predeploy no tag error
This commit is contained in:
parent
9cc5f2734b
commit
3529316fdd
6
predeploy/Jenkinsfile
vendored
6
predeploy/Jenkinsfile
vendored
@ -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}/*/**"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user