Merge pull request jenkinsci#94 from aaronwalker/master

aaronwalker · web-flow · commit b1882733a13c · 2021-04-23T11:21:03.000+02:00
fix(triggers): handles github repos with mixed case org and repo names
diff --git a/src/main/java/org/jenkinsci/plugins/pipeline/github/trigger/IssueCommentTrigger.java b/src/main/java/org/jenkinsci/plugins/pipeline/github/trigger/IssueCommentTrigger.java
@@ -68,7 +68,7 @@ private String getKey(final WorkflowJob project) {
         return String.format("%s/%s/%d",
                 scmSource.getRepoOwner(),
                 scmSource.getRepository(),
-                scmHead.getNumber());
+                scmHead.getNumber()).toLowerCase();
     }
 
     public String getCommentPattern() {
@@ -92,7 +92,7 @@ public boolean isApplicable(final Item item) {
         }
 
         public Set<WorkflowJob> getJobs(final String key) {
-            return jobs.getOrDefault(key, Collections.emptySet());
+            return jobs.getOrDefault(key.toLowerCase(), Collections.emptySet());
         }
     }
 
diff --git a/src/main/java/org/jenkinsci/plugins/pipeline/github/trigger/PullRequestReviewTrigger.java b/src/main/java/org/jenkinsci/plugins/pipeline/github/trigger/PullRequestReviewTrigger.java
@@ -78,7 +78,7 @@ private String getKey(final WorkflowJob project) {
       return String.format("%s/%s/%d",
               scmSource.getRepoOwner(),
               scmSource.getRepository(),
-              scmHead.getNumber());
+              scmHead.getNumber()).toLowerCase();
   }
 
   boolean matches(final String reviewState) {
@@ -101,7 +101,7 @@ public boolean isApplicable(final Item item) {
       }
 
       public Set<WorkflowJob> getJobs(final String key) {
-          return jobs.getOrDefault(key, Collections.emptySet());
+          return jobs.getOrDefault(key.toLowerCase(), Collections.emptySet());
       }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ private String getKey(final WorkflowJob project) {`
`68`	`68`	`return String.format("%s/%s/%d",`
`69`	`69`	`scmSource.getRepoOwner(),`
`70`	`70`	`scmSource.getRepository(),`
`71`		`- scmHead.getNumber());`
	`71`	`+ scmHead.getNumber()).toLowerCase();`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`public String getCommentPattern() {`
`@@ -92,7 +92,7 @@ public boolean isApplicable(final Item item) {`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`public Set<WorkflowJob> getJobs(final String key) {`
`95`		`- return jobs.getOrDefault(key, Collections.emptySet());`
	`95`	`+ return jobs.getOrDefault(key.toLowerCase(), Collections.emptySet());`
`96`	`96`	`}`
`97`	`97`	`}`
`98`	`98`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ private String getKey(final WorkflowJob project) {`
`78`	`78`	`return String.format("%s/%s/%d",`
`79`	`79`	`scmSource.getRepoOwner(),`
`80`	`80`	`scmSource.getRepository(),`
`81`		`- scmHead.getNumber());`
	`81`	`+ scmHead.getNumber()).toLowerCase();`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`boolean matches(final String reviewState) {`
`@@ -101,7 +101,7 @@ public boolean isApplicable(final Item item) {`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`public Set<WorkflowJob> getJobs(final String key) {`
`104`		`- return jobs.getOrDefault(key, Collections.emptySet());`
	`104`	`+ return jobs.getOrDefault(key.toLowerCase(), Collections.emptySet());`
`105`	`105`	`}`
`106`	`106`	`}`
`107`	`107`	`}`