From 82417626393741bf8c2638ca64c48e1907b66006 Mon Sep 17 00:00:00 2001 From: Daniel Brooks Date: Sun, 6 Jul 2014 12:43:19 -0700 Subject: [PATCH] Making branches not split with \ and instead use replace. --- gitlab-jenkins.iml | 39 +++++++++++++++++++ .../gitlabjenkins/GitLabPushTrigger.java | 14 ++----- 2 files changed, 42 insertions(+), 11 deletions(-) diff --git a/gitlab-jenkins.iml b/gitlab-jenkins.iml index a8e778b..610a88d 100644 --- a/gitlab-jenkins.iml +++ b/gitlab-jenkins.iml @@ -29,6 +29,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/dabsquared/gitlabjenkins/GitLabPushTrigger.java b/src/main/java/com/dabsquared/gitlabjenkins/GitLabPushTrigger.java index 0dd3472..22b4613 100644 --- a/src/main/java/com/dabsquared/gitlabjenkins/GitLabPushTrigger.java +++ b/src/main/java/com/dabsquared/gitlabjenkins/GitLabPushTrigger.java @@ -79,21 +79,13 @@ public class GitLabPushTrigger extends Trigger> { private Action[] createActions(GitLabPushRequest req) { ArrayList actions = new ArrayList(); - String[] branches = req.getRef().split("/"); - - String branch = branches[branches.length-1]; + String branch = req.getRef().replaceAll("refs/heads/", ""); LOGGER.log(Level.INFO, "GitLab Push Request from branch {0}.", branch); - - GitSCM scm = (GitSCM) job.getScm(); - - BranchSpec spec = scm.getBranches().get(0); - String randomBranchName = spec.getName(); - Map values = new HashMap(); - values.put("gitlabSourceBranch", new StringParameterValue("gitlabSourceBranch", randomBranchName)); - values.put("gitlabTargetBranch", new StringParameterValue("gitlabTargetBranch", randomBranchName)); + values.put("gitlabSourceBranch", new StringParameterValue("gitlabSourceBranch", branch)); + values.put("gitlabTargetBranch", new StringParameterValue("gitlabTargetBranch", branch)); values.put("gitlabBranch", new StringParameterValue("gitlabBranch", branch)); List listValues = new ArrayList(values.values());