From 2d609bf8ffac5350d78c15caf725279235379310 Mon Sep 17 00:00:00 2001
From: wangzilun <964606955@qq.com>
Date: Wed, 23 Feb 2022 15:38:55 +0800
Subject: [PATCH] 测试
---
Jenkinsfile | 34 +++++-----------------------------
1 files changed, 5 insertions(+), 29 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index fcc5547..f192630 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
@@ -66,31 +67,6 @@
##cp *.war \$dir_name
##zip -r "\$dir_name.zip" \$dir_name
'''
- }
- }
- stage('version add master') {
- when {
- //版本号自动添加逻辑需同时符合下列触发条件：
- //1. 不能在master分支触发
- //2. 有任意浏览器页面资源文件修改
- //3. 不包含[项目名.java]文件的修改
- allOf {
- anyOf {
- changeset "**/*.js"
- changeset "**/*.css"
- changeset "**/*.html"
- changeset "**/*.xhtml"
- changeset "**/*.jpg"
- changeset "**/*.png"
- }
- not {
- changeset "**/${project_name}.java"
- }
- branch 'master'
- }
- }
- steps {
- versionAddDevelop("${project_name}","${GIT_CREDENTIALS_ID}","${url}","${GIT_BRANCH}")
}
}
--
Gitblit v1.9.1