From fc3c3597f1dc42acaaf379a00e55804d924afb16 Mon Sep 17 00:00:00 2001
From: wangzilun <964606955@qq.com>
Date: Mon, 21 Feb 2022 18:14:24 +0800
Subject: [PATCH] 测试
---
Jenkinsfile | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 41e2bd5..c65cea3 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -68,7 +68,24 @@
'''
}
}
- stage('version add') {
+
+ stage('master version add') {
+ when {
+ not {
+ allOf {
+ changeset "**/${project_name}.java"
+ }
+ }
+ branch 'master'
+ }
+ steps {
+ //http(s)的git链接使用帐号密码，ssh使用 keyFileVariable: 'SSH_KEY'
+ echo "todo version add"
+ versionAddDevelop("${project_name}","${GIT_CREDENTIALS_ID}","${url}","${GIT_BRANCH}")
+ }
+ }
+
+ stage('version add master') {
when {
//版本号自动添加逻辑需同时符合下列触发条件：
//1. 不能在master分支触发
@@ -86,13 +103,14 @@
not {
changeset "**/${project_name}.java"
}
- branch 'master'
+ branch 'develop'
}
}
steps {
- versionAddTest("${project_name}","${GIT_CREDENTIALS_ID}","${url}","${GIT_BRANCH}")
+ versionAddDevelop("${project_name}","${GIT_CREDENTIALS_ID}","${url}","${GIT_BRANCH}")
}
}
+
stage('deploy') {
when { branch 'master' }
steps {
--
Gitblit v1.9.1