Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
jenkins
提交
d0d9216f
J
jenkins
项目概览
xxadev
/
jenkins
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
jenkins
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
d0d9216f
编写于
2月 20, 2017
作者:
S
Stephen Connolly
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[FIXED JENKINS-42194] Do not display a warning when ignoring post-commit hooks
上级
0e67ad4e
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
18 addition
and
1 deletion
+18
-1
core/src/main/java/hudson/triggers/SCMTrigger.java
core/src/main/java/hudson/triggers/SCMTrigger.java
+16
-0
core/src/main/resources/hudson/triggers/Messages.properties
core/src/main/resources/hudson/triggers/Messages.properties
+1
-0
core/src/main/resources/hudson/triggers/SCMTrigger/config.jelly
...rc/main/resources/hudson/triggers/SCMTrigger/config.jelly
+1
-1
未找到文件。
core/src/main/java/hudson/triggers/SCMTrigger.java
浏览文件 @
d0d9216f
...
...
@@ -72,10 +72,12 @@ import jenkins.util.SystemProperties;
import
net.sf.json.JSONObject
;
import
org.apache.commons.io.FileUtils
;
import
org.apache.commons.jelly.XMLOutput
;
import
org.apache.commons.lang.StringUtils
;
import
org.jenkinsci.Symbol
;
import
org.kohsuke.accmod.Restricted
;
import
org.kohsuke.accmod.restrictions.DoNotUse
;
import
org.kohsuke.accmod.restrictions.NoExternalUse
;
import
org.kohsuke.stapler.AncestorInPath
;
import
org.kohsuke.stapler.DataBoundConstructor
;
import
org.kohsuke.stapler.DataBoundSetter
;
import
org.kohsuke.stapler.QueryParameter
;
...
...
@@ -358,6 +360,20 @@ public class SCMTrigger extends Trigger<Item> {
return
FormValidation
.
ok
();
return
FormValidation
.
validateNonNegativeInteger
(
value
);
}
/**
* Performs syntax check.
*/
public
FormValidation
doCheckScmpoll_spec
(
@QueryParameter
String
value
,
@QueryParameter
boolean
ignorePostCommitHooks
,
@AncestorInPath
Item
item
)
{
if
(
ignorePostCommitHooks
&&
StringUtils
.
isBlank
(
value
))
{
return
FormValidation
.
ok
(
Messages
.
SCMTrigger_no_schedules_no_hooks
());
}
else
{
return
Jenkins
.
getInstance
().
getDescriptorByType
(
TimerTrigger
.
DescriptorImpl
.
class
)
.
doCheckSpec
(
value
,
item
);
}
}
}
@Extension
...
...
core/src/main/resources/hudson/triggers/Messages.properties
浏览文件 @
d0d9216f
...
...
@@ -23,6 +23,7 @@
SCMTrigger.DisplayName
=
Poll SCM
SCMTrigger.getDisplayName
=
{0} Polling Log
SCMTrigger.BuildAction.DisplayName
=
Polling Log
SCMTrigger.no_schedules_no_hooks
=
Post commit hooks are being ignored and no schedules so will never run
SCMTrigger.SCMTriggerCause.ShortDescription
=
Started by an SCM change
TimerTrigger.DisplayName
=
Build periodically
TimerTrigger.MissingWhitespace
=
You appear to be missing whitespace between * and *.
...
...
core/src/main/resources/hudson/triggers/SCMTrigger/config.jelly
浏览文件 @
d0d9216f
...
...
@@ -25,7 +25,7 @@ THE SOFTWARE.
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
<f:entry title="${%Schedule}" help="/descriptor/hudson.triggers.TimerTrigger/help/spec">
<f:textarea field="scmpoll_spec"
checkUrl="'descriptorByName/hudson.triggers.TimerTrigger/checkSpec?value='+encodeURIComponent(this.value)"
/>
<f:textarea field="scmpoll_spec"/>
</f:entry>
<f:entry field="ignorePostCommitHooks" title="${%Ignore post-commit hooks}">
<f:checkbox />
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录