From 36709e2da3ecbeee4bf140776a64ae7e021e332d Mon Sep 17 00:00:00 2001
From: zhanglei <zhanglei9588@foxmail.com>
Date: Sat, 20 Nov 2021 00:18:33 +0800
Subject: [PATCH] fix1

---
 Jenkinsfile |   48 +++++++++++++++++++++++++++---------------------
 1 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 8de225d..7a9ceed 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -29,31 +29,32 @@
         }
         stage('test') {
             steps {
+
                 sh '''
                     #定义颜色的变量
-                    RED_COLOR='\E[1;31m'   #红
-                    GREEN_COLOR='\E[1;32m' #绿
-                    YELOW_COLOR='\E[1;33m' #黄
-                    BLUE_COLOR='\E[1;34m'  #蓝
-                    PINK='\E[1;35m'        #粉红
-                    RES='\E[0m'
+                    RED_COLOR='\\E[1;31m'   #红
+                    GREEN_COLOR='\\E[1;32m' #绿
+                    YELOW_COLOR='\\E[1;33m' #黄
+                    BLUE_COLOR='\\E[1;34m'  #蓝
+                    PINK='\\E[1;35m'        #粉红
+                    RES='\\E[0m'
 
                     #需要使用echo -e
-                    echo -e  "${RED_COLOR}======red color======${RES}"
-                    echo -e  "${YELOW_COLOR}======yelow color======${RES}"
-                    echo -e  "${BLUE_COLOR}======green color======${RES}"
-                    echo -e  "${GREEN_COLOR}======green color======${RES}"
-                    echo -e  "${PINK}======pink color======${RES}"
+                    echo -e  "\${RED_COLOR}======red color======\${RES}"
+                    echo -e  "\${YELOW_COLOR}======yelow color======\${RES}"
+                    echo -e  "\${BLUE_COLOR}======green color======\${RES}"
+                    echo -e  "\${GREEN_COLOR}======green color======\${RES}"
+                    echo -e  "\${PINK}======pink color======\${RES}"
                     echo "#######################################"
                     #直接把echo -e放到变量里面,使用的时候直接输出变量即可
-                    SETCOLOR_SUCCESS="echo -en \\033[1;32m"
-                    SETCOLOR_FAILURE="echo -en \\033[1;31m"
-                    SETCOLOR_WARNING="echo -en \\033[1;33m"
-                    SETCOLOR_NORMAL="echo -en \\033[0;39m"
-                    echo ----成功了!-----  &&  $SETCOLOR_SUCCESS
-                    echo ----失败了!-----  &&  $SETCOLOR_FAILURE
-                    echo ----需注意!-----  &&  $SETCOLOR_WARNING
-                    echo ----正常的!-----  &&  $SETCOLOR_NORMAL
+                    SETCOLOR_SUCCESS="echo -en \\\\033[1;32m"
+                    SETCOLOR_FAILURE="echo -en \\\\033[1;31m"
+                    SETCOLOR_WARNING="echo -en \\\\033[1;33m"
+                    SETCOLOR_NORMAL="echo -en \\\\033[0;39m"
+                    echo ----成功了!-----  &&  \$SETCOLOR_SUCCESS
+                    echo ----失败了!-----  &&  \$SETCOLOR_FAILURE
+                    echo ----需注意!-----  &&  \$SETCOLOR_WARNING
+                    echo ----正常的!-----  &&  \$SETCOLOR_NORMAL
 
                     echo "BRANCH ${GIT_BRANCH}"
                     printenv
@@ -64,6 +65,9 @@
         stage('version add') {
             when {
                 allOf {
+                    not {
+                        branch 'master'
+                    }
                     anyOf {
                         changeset "**/*.js"
                         changeset "**/*.css"
@@ -77,11 +81,13 @@
                     }
                 }
             }
-            steps {
-                versionAdd("${project_name}","${GIT_CREDENTIALS_ID}","${url}","${GIT_BRANCH}")
+            steps{
+                echo "todo add version"
             }
+
         }
         stage('deploy') {
+            when { branch 'master' }
             steps {
                 sh 'echo test'
             }

--
Gitblit v1.9.1