From 9802ea328f61344dad63f3fbf57945342432a915 Mon Sep 17 00:00:00 2001
From: wangzilun <964606955@qq.com>
Date: Mon, 21 Feb 2022 17:21:26 +0800
Subject: [PATCH] 测试
---
Jenkinsfile | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 323b555..d400fab 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -51,7 +51,7 @@
####maven编译部署#####
##mvn clean package -U
##处理结果包
- old_version_all=\$(find . -iname "\${project_name}.java"| xargs sed -nr 's/^[^0-9]*\\"(([0-9]+\\.)*[0-9]+.*-[0-9]+)\\".*;/\\1/p\')
+ old_version=\$(find . -iname "\${project_name}.java"| xargs sed -nr 's/^[^0-9]*(([0-9]+\\.)*[0-9]+).*;/\\1/p\')
if [ "\$old_version_all" =~ "-" ];then
echo "包含"
else
@@ -75,9 +75,6 @@
//2. 有任意浏览器页面资源文件修改
//3. 不包含[项目名.java]文件的修改
allOf {
- not {
- branch 'master'
- }
anyOf {
changeset "**/*.js"
changeset "**/*.css"
@@ -89,10 +86,11 @@
not {
changeset "**/${project_name}.java"
}
+ branch 'master'
}
}
steps {
- versionAddTest("${project_name}","${GIT_CREDENTIALS_ID}","${url}","${GIT_BRANCH}")
+ versionAddDevelop("${project_name}","${GIT_CREDENTIALS_ID}","${url}","${GIT_BRANCH}")
}
}
stage('deploy') {
--
Gitblit v1.9.1