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

Merge pull request #163 from AndreasBoehme/master 

Bug #160: allow merge requests to different branches from one commit.
This commit is contained in:
Owen Mehegan 2015-12-19 15:33:51 -08:00
parent f0426fb80b b5c9f5fcd0
commit a23cad0ced
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/com/dabsquared/gitlabjenkins/GitLabWebHook.java
View File

@ -1,6 +1,7 @@
package com.dabsquared.gitlabjenkins;
import com.dabsquared.gitlabjenkins.GitLabMergeRequest.LastCommit;
import hudson.Extension;
import hudson.model.*;
import hudson.plugins.git.Branch;
@ -42,6 +43,7 @@ import jenkins.model.ParameterizedJobMixIn;
import org.acegisecurity.Authentication;
import org.acegisecurity.context.SecurityContextHolder;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
import org.eclipse.jgit.lib.ObjectId;
import org.gitlab.api.models.GitlabBranch;
import org.gitlab.api.models.GitlabCommit;
@ -472,9 +474,18 @@ public class GitLabWebHook implements UnprotectedRootAction {
}
if(request.getObjectAttribute().getLastCommit()!=null) {
Run mergeBuild = getBuildBySHA1(project, request.getObjectAttribute().getLastCommit().getId(), true);
if(mergeBuild!=null){
LOGGER.log(Level.INFO, "Last commit in Merge Request has already been built in build #"+mergeBuild.getId());
return;
if (mergeBuild != null) {
StringParameterValue mergeBuildTargetBranch = (StringParameterValue) mergeBuild.getAction(ParametersAction.class).getParameter("gitlabTargetBranch");
boolean targetBranchesEqual = StringUtils.equals(mergeBuildTargetBranch.value, request.getObjectAttribute().getTargetBranch());
LOGGER.fine("Previous build's target-branch: " + mergeBuildTargetBranch.value
+ ", current build's target-branch: "
+ request.getObjectAttribute().getTargetBranch() + ", equals: "
+ targetBranchesEqual);
if (targetBranchesEqual) {
LOGGER.log(Level.INFO, "Last commit in Merge Request has already been built in build #" + mergeBuild.getId());
return;
}
}
}