From af920d6431502b4b1e069267bf3c219d5d1cf7df Mon Sep 17 00:00:00 2001
From: wangzilun <964606955@qq.com>
Date: Wed, 06 Apr 2022 10:43:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Jenkinsfile | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 3738f9a..5fbfd58 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -82,7 +82,7 @@
}
}
- stage('version add master') {
+ stage('version add develop') {
when {
//版本号自动添加逻辑需同时符合下列触发条件：
//1. 不能在master分支触发
@@ -104,7 +104,7 @@
}
}
steps {
- versionAddDevelop("${project_name}","${GIT_CREDENTIALS_ID}","${url}","${GIT_BRANCH}")
+ versionAddCom("${project_name}","${GIT_CREDENTIALS_ID}","${url}","${GIT_BRANCH}")
}
}
--
Gitblit v1.9.1