From ee41371edaea289af7a39addcfa8f01c4b42161e Mon Sep 17 00:00:00 2001
From: wangzilun <964606955@qq.com>
Date: Wed, 23 Feb 2022 15:33:12 +0800
Subject: [PATCH] 测试
---
Jenkinsfile | 31 +++++++++++++++++++++++++------
1 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index d400fab..2610ccc 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -51,14 +51,15 @@
####maven编译部署#####
##mvn clean package -U
##处理结果包
- old_version=\$(find . -iname "\${project_name}.java"| xargs sed -nr 's/^[^0-9]*(([0-9]+\\.)*[0-9]+).*;/\\1/p\')
- if [ "\$old_version_all" =~ "-" ];then
+ versionFile=\$(find . -iname "${project_name}.java")
+ 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" =~ \'-\'] ];then
echo "包含"
else
echo "不包含"
fi
- echo "old_version_all \$old_version_all"
- echo "project_name \$project_name"
dir_name=\${project_name}"-"\$old_version_all
echo "dir_name \$dir_name"
##cd target
@@ -68,7 +69,24 @@
'''
}
}
- stage('version add') {
+
+ stage('master version add') {
+ when {
+ not {
+ allOf {
+ changeset "**/${project_name}.java"
+ }
+ }
+ branch 'master'
+ }
+ steps {
+ //http(s)的git链接使用帐号密码，ssh使用 keyFileVariable: 'SSH_KEY'
+ echo "todo version add"
+ versionAddDevelop("${project_name}","${GIT_CREDENTIALS_ID}","${url}","${GIT_BRANCH}")
+ }
+ }
+
+ stage('version add master') {
when {
//版本号自动添加逻辑需同时符合下列触发条件：
//1. 不能在master分支触发
@@ -86,13 +104,14 @@
not {
changeset "**/${project_name}.java"
}
- branch 'master'
+ branch 'develop'
}
}
steps {
versionAddDevelop("${project_name}","${GIT_CREDENTIALS_ID}","${url}","${GIT_BRANCH}")
}
}
+
stage('deploy') {
when { branch 'master' }
steps {
--
Gitblit v1.9.1