From ae86d977b46ce7c8aa62df4ed9453bd597c74e5a Mon Sep 17 00:00:00 2001
From: jenkins <jenkins@hbbh.com>
Date: Mon, 21 Feb 2022 18:14:46 +0800
Subject: [PATCH] add version to 1.9.0-SNAPSHOT-3
---
Jenkinsfile | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index d2d8355..c65cea3 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -68,16 +68,30 @@
'''
}
}
- 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分支触发
//2. 有任意浏览器页面资源文件修改
//3. 不包含[项目名.java]文件的修改
allOf {
- not {
- branch 'master'
- }
anyOf {
changeset "**/*.js"
changeset "**/*.css"
@@ -89,12 +103,14 @@
not {
changeset "**/${project_name}.java"
}
+ 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