p85947160
/
Gitee-Jenkins-Plugin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

!6 修复不同WebHook相同序号的 PR 请求，并发触发的构建被判断为相同构建取消问题 

Merge pull request !6 from silverballer/ISSUE#I2BALI
This commit is contained in:
Yashin 2020-12-30 16:40:44 +08:00 committed by Gitee
parent 5456b20ebc 8f500cfb67
commit ba9dc1aa7b
3 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/gitee/jenkins/trigger/handler/AbstractWebHookTriggerHandler.java
View File

@ -89,16 +89,17 @@ public abstract class AbstractWebHookTriggerHandler<H extends WebHook> implement
protected abstract BuildStatusUpdate retrieveBuildStatusUpdate(H hook); protected abstract BuildStatusUpdate retrieveBuildStatusUpdate(H hook);
protected URIish retrieveUrIish(WebHook hook, GitSCM gitSCM) { protected URIish retrieveUrIish(WebHook hook, GitSCM gitSCM) {
if (gitSCM == null) { if (hook.getRepository() == null) {
return null; return null;
} }
List<URIish> uris = new ArrayList<URIish>();
try { try {
if (hook.getRepository() != null) { if (gitSCM == null) {
uris.add(new URIish(hook.getRepository().getUrl())); return new URIish(hook.getRepository().getGitHttpUrl());
uris.add(new URIish(hook.getRepository().getGitHttpUrl()));
uris.add(new URIish(hook.getRepository().getGitSshUrl()));
} }
List<URIish> uris = new ArrayList<URIish>();
uris.add(new URIish(hook.getRepository().getUrl()));
uris.add(new URIish(hook.getRepository().getGitHttpUrl()));
uris.add(new URIish(hook.getRepository().getGitSshUrl()));
// uri 需与当前项目仓库个url一致，避免触发多个构建 // uri 需与当前项目仓库个url一致，避免触发多个构建
for (RemoteConfig remote : gitSCM.getRepositories()) { for (RemoteConfig remote : gitSCM.getRepositories()) {
for (URIish remoteURL : remote.getURIs()) { for (URIish remoteURL : remote.getURIs()) {

10
src/main/java/com/gitee/jenkins/trigger/handler/note/NoteHookTriggerHandlerImpl.java
View File

@ -213,9 +213,13 @@ class NoteHookTriggerHandlerImpl extends AbstractWebHookTriggerHandler<NoteHook>
} }
private String retrieveRevisionToBuild(NoteHook hook) throws NoRevisionToBuildException { private String retrieveRevisionToBuild(NoteHook hook) throws NoRevisionToBuildException {
if (hook.getPullRequest() != null if (hook.getPullRequest() != null) {
&& hook.getPullRequest().getMergeReferenceName() != null) { if (hook.getPullRequest().getMergeCommitSha() != null) {
return hook.getPullRequest().getMergeReferenceName(); return hook.getPullRequest().getMergeCommitSha();
}
if (hook.getPullRequest().getMergeReferenceName() != null) {
return hook.getPullRequest().getMergeReferenceName();
}
} }
// 兼容来自commit的评论 // 兼容来自commit的评论

13
src/main/java/com/gitee/jenkins/trigger/handler/pull/PullRequestHookTriggerHandlerImpl.java
View File

@ -246,12 +246,15 @@ class PullRequestHookTriggerHandlerImpl extends AbstractWebHookTriggerHandler<Pu
} }
private String retrieveRevisionToBuild(PullRequestHook hook) throws NoRevisionToBuildException { private String retrieveRevisionToBuild(PullRequestHook hook) throws NoRevisionToBuildException {
if (hook.getPullRequest() != null if (hook.getPullRequest() != null) {
&& hook.getPullRequest().getMergeReferenceName() != null) { if (hook.getPullRequest().getMergeCommitSha() != null) {
return hook.getPullRequest().getMergeReferenceName(); return hook.getPullRequest().getMergeCommitSha();
} else { }
throw new NoRevisionToBuildException(); if (hook.getPullRequest().getMergeReferenceName() != null) {
return hook.getPullRequest().getMergeReferenceName();
}
} }
throw new NoRevisionToBuildException();
} }
private String getTargetBranchFromBuild(Run<?, ?> mergeBuild) { private String getTargetBranchFromBuild(Run<?, ?> mergeBuild) {