补充28

wangzilun

2022-04-06 7a0c63fdd7bfcb3c6abe165df5997fc5f6568492

 Jenkinsfile

@@ -56,11 +56,6 @@
                    old_version_all=\$(cat \$versionFile | sed -nr \'s/^[^0-9]*"([^"]+)".*;/\\1/p\')
                    echo "old_version_all \$old_version_all"
                    echo "project_name \$project_name"
                    if [[ "\${old_version_all}" =~ "\$str" ]];then
                        echo "包含"
                    else
                        echo "不包含"
                    fi
                    dir_name=\${project_name}"-"\$old_version_all
                    echo "dir_name \$dir_name"
                    ##cd target
@@ -83,11 +78,11 @@
            steps {
                //http(s)的git链接使用帐号密码，ssh使用 keyFileVariable: 'SSH_KEY'
                echo "todo version add"
                //versionAddDevelop("${project_name}","${GIT_CREDENTIALS_ID}","${url}","${GIT_BRANCH}")
                versionAddCom("${project_name}","${GIT_CREDENTIALS_ID}","${url}","${GIT_BRANCH}")
                }
        }

        stage('version add master') {
        stage('version add develop') {
            when {
                //版本号自动添加逻辑需同时符合下列触发条件：
                //1. 不能在master分支触发
@@ -109,7 +104,7 @@
                }
            }
            steps {
                versionAddDevelop("${project_name}","${GIT_CREDENTIALS_ID}","${url}","${GIT_BRANCH}")
                versionAddCom("${project_name}","${GIT_CREDENTIALS_ID}","${url}","${GIT_BRANCH}")
            }
        }