From b9e4c0f10ed1f35bda230dbe5f96a681143b5c1d Mon Sep 17 00:00:00 2001
From: wangzilun <964606955@qq.com>
Date: Mon, 21 Feb 2022 17:11:02 +0800
Subject: [PATCH] 测试

---
 Jenkinsfile |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 323b555..41e2bd5 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,6 +86,7 @@
                     not {
                         changeset "**/${project_name}.java"
                     }
+                    branch 'master'
                 }
             }
             steps {

--
Gitblit v1.9.1