From 4fd958a94fdc366ba0414c0615dc638622d770dd Mon Sep 17 00:00:00 2001
From: zhanglei <zhanglei9588@foxmail.com>
Date: Thu, 18 Nov 2021 18:30:33 +0800
Subject: [PATCH] Merge branch 'hotfix/1.0.1'
---
Jenkinsfile | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 740fe3d..7142e8f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -11,6 +11,7 @@
options {
//给日志加上时间错， 需安装 Timestamper 插件
timestamps()
+ ansiColor('xterm')
}
stages {
stage('source') {
@@ -33,6 +34,9 @@
stage('version add') {
when {
allOf {
+ not {
+ branch 'master'
+ }
anyOf {
changeset "**/*.js"
changeset "**/*.css"
@@ -46,11 +50,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