From 3efbb10ae1612714aec4881e9d71a9fd5d6a49fe Mon Sep 17 00:00:00 2001
From: wangzilun <964606955@qq.com>
Date: Mon, 21 Feb 2022 18:12:44 +0800
Subject: [PATCH] 测试
---
Jenkinsfile | 50 +++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 45 insertions(+), 5 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 9318551..fcc5547 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -68,16 +68,13 @@
'''
}
}
- stage('version add') {
+ stage('version add master') {
when {
//版本号自动添加逻辑需同时符合下列触发条件：
//1. 不能在master分支触发
//2. 有任意浏览器页面资源文件修改
//3. 不包含[项目名.java]文件的修改
allOf {
- not {
- branch 'master'
- }
anyOf {
changeset "**/*.js"
changeset "**/*.css"
@@ -93,9 +90,52 @@
}
}
steps {
- versionAddTest("${project_name}","${GIT_CREDENTIALS_ID}","${url}","${GIT_BRANCH}")
+ versionAddDevelop("${project_name}","${GIT_CREDENTIALS_ID}","${url}","${GIT_BRANCH}")
}
}
+
+ 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 {
+ anyOf {
+ changeset "**/*.js"
+ changeset "**/*.css"
+ changeset "**/*.html"
+ changeset "**/*.xhtml"
+ changeset "**/*.jpg"
+ changeset "**/*.png"
+ }
+ not {
+ changeset "**/${project_name}.java"
+ }
+ branch 'develop'
+ }
+ }
+ steps {
+ versionAddDevelop("${project_name}","${GIT_CREDENTIALS_ID}","${url}","${GIT_BRANCH}")
+ }
+ }
+
stage('deploy') {
when { branch 'master' }
steps {
--
Gitblit v1.9.1