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

---
 Jenkinsfile |   21 ++++++++++++---------
 1 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 7c4cca9..076d05a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -49,17 +49,22 @@
             steps {
                 sh '''#!/bin/sh
                     ####maven编译部署#####
-                    mvn clean package -U
+                    ##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
+                        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
-                    mkdir \$dir_name
-                    cp *.war \$dir_name
-                    zip -r "\$dir_name.zip" \$dir_name
+                    ##cd target
+                    ##mkdir \$dir_name
+                    ##cp *.war \$dir_name
+                    ##zip -r "\$dir_name.zip" \$dir_name
                 '''
             }
         }
@@ -70,9 +75,6 @@
                 //2. 有任意浏览器页面资源文件修改
                 //3. 不包含[项目名.java]文件的修改
                 allOf {
-                    not {
-                        branch 'master'
-                    }
                     anyOf {
                         changeset "**/*.js"
                         changeset "**/*.css"
@@ -84,6 +86,7 @@
                     not {
                         changeset "**/${project_name}.java"
                     }
+                    branch 'develop'
                 }
             }
             steps {

--
Gitblit v1.9.1