Merge pull request #41 from flowlogix/master

fixes intermittent multiple job invocations
jenkinsci · Jun 13, 2022 · 40b920e · 40b920e
2 parents 49f749d + 54433e9
commit 40b920e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/src/main/java/com/adobe/jenkins/github_pr_comment_build/IssueCommentGHEventSubscriber.java b/src/main/java/com/adobe/jenkins/github_pr_comment_build/IssueCommentGHEventSubscriber.java
@@ -125,6 +125,7 @@ protected void onEvent(GHEvent event, String payload) {
             @Override
             public void run() {
                 boolean jobFound = false;
+                topLevel:
                 for (final SCMSourceOwner owner : SCMSourceOwners.all()) {
                     for (SCMSource source : owner.getSCMSources()) {
                         if (!(source instanceof GitHubSCMSource)) {
@@ -161,13 +162,14 @@ public void run() {
                                                             changedRepository.getRepositoryName()
                                                     }
                                             );
+                                            break topLevel;
                                         } else {
                                             LOGGER.log(Level.FINER,
                                                     "Issue comment does not match the trigger build string ({0}) for {1}",
                                                     new Object[] { expectedCommentBody, job.getFullName() }
                                             );
+                                            break;
                                         }
-                                        break;
                                     }
 
                                     if (!propFound) {

diff --git a/src/main/java/com/adobe/jenkins/github_pr_comment_build/PRReviewGHEventSubscriber.java b/src/main/java/com/adobe/jenkins/github_pr_comment_build/PRReviewGHEventSubscriber.java
@@ -96,6 +96,7 @@ protected void onEvent(GHEvent event, String payload) {
             @Override
             public void run() {
                 boolean jobFound = false;
+                topLevel:
                 for (final SCMSourceOwner owner : SCMSourceOwners.all()) {
                     for (SCMSource source : owner.getSCMSources()) {
                         if (!(source instanceof GitHubSCMSource)) {
@@ -118,7 +119,7 @@ public void run() {
                                         propFound = true;
                                         ParameterizedJobMixIn.scheduleBuild2(job, 0,
                                                 new CauseAction(new GitHubPullRequestReviewCause(pullRequestUrl)));
-                                        break;
+                                        break topLevel;
                                     }
 
                                     if (!propFound) {

diff --git a/src/main/java/com/adobe/jenkins/github_pr_comment_build/PRUpdateGHEventSubscriber.java b/src/main/java/com/adobe/jenkins/github_pr_comment_build/PRUpdateGHEventSubscriber.java
@@ -112,6 +112,7 @@ protected void onEvent(GHEvent event, String payload) {
             @Override
             public void run() {
                 boolean jobFound = false;
+                topLevel:
                 for (final SCMSourceOwner owner : SCMSourceOwners.all()) {
                     for (SCMSource source : owner.getSCMSources()) {
                         if (!(source instanceof GitHubSCMSource)) {
@@ -134,7 +135,7 @@ public void run() {
                                         propFound = true;
                                         ParameterizedJobMixIn.scheduleBuild2(job, 0,
                                                 new CauseAction(new GitHubPullRequestUpdateCause(pullRequestUrl)));
-                                        break;
+                                        break topLevel;
                                     }
 
                                     if (!propFound) {