Merge pull request #15 from lwalkera/gh-skip-phrase

Make skip phrase check comments as well as titles
jenkinsci · Sep 22, 2016 · bf42717 · bf42717
2 parents a38c369 + 2576c4d
commit bf42717
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/main/java/stashpullrequestbuilder/stashpullrequestbuilder/StashRepository.java b/src/main/java/stashpullrequestbuilder/stashpullrequestbuilder/StashRepository.java
@@ -319,7 +319,10 @@ private boolean isBuildTarget(StashPullRequestResponseValue pullRequest) {
                         }
                     }
 
-                    if (isPhrasesContain(content, this.trigger.getCiBuildPhrases())) {
+                    if(isSkipBuild(content)) {
+                        shouldBuild = false;
+                        break;
+                    } if (isPhrasesContain(content, this.trigger.getCiBuildPhrases())) {
                         shouldBuild = true;
                         break;
                     }
@@ -346,12 +349,12 @@ private boolean isForTargetBranch(StashPullRequestResponseValue pullRequest) {
         return true;
     }
 
-    private boolean isSkipBuild(String pullRequestTitle) {
+    private boolean isSkipBuild(String pullRequestContentString) {
         String skipPhrases = this.trigger.getCiSkipPhrases();
         if (skipPhrases != null && !"".equals(skipPhrases)) {
             String[] phrases = skipPhrases.split(",");
             for(String phrase : phrases) {
-                if (isPhrasesContain(pullRequestTitle, phrase)) {
+                if (isPhrasesContain(pullRequestContentString, phrase)) {
                     return true;
                 }
             }