Merge pull request #46 from jenkinsci/fix-latest-date

Use correct "latest commit date" for GitHub PRs
jenkinsci · Oct 24, 2024 · 2ca09cc · 2ca09cc
2 parents 9d01cee + e4110d3
commit 2ca09cc
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/...-filter-aged-refs/src/main/java/org/jenkinsci/plugins/scm_filter/GitHubAgedRefsTrait.java b/...-filter-aged-refs/src/main/java/org/jenkinsci/plugins/scm_filter/GitHubAgedRefsTrait.java
@@ -96,16 +96,18 @@ public boolean isExcluded(@NonNull SCMSourceRequest scmSourceRequest, @NonNull S
                         .findAny();
                 if (pull.isPresent()) {
                     PagedIterator<GHPullRequestCommitDetail> iterator =
-                            pull.get().listCommits().withPageSize(1).iterator();
-                    // Has at least one commit
-                    if (iterator.hasNext()) {
-                        long pullTS = iterator.next()
+                            pull.get().listCommits().iterator();
+                    long latestPullTS = 0;
+                    while (iterator.hasNext()) {
+                        long commitTS = iterator.next()
                                 .getCommit()
-                                .getAuthor()
+                                .getCommitter()
                                 .getDate()
                                 .getTime();
-                        return pullTS < super.getAcceptableDateTimeThreshold();
+                        if (commitTS > latestPullTS) latestPullTS = commitTS;
                     }
+                    // Did we see at least one commit?
+                    if (latestPullTS > 0) return latestPullTS < super.getAcceptableDateTimeThreshold();
                 }
                 return false;
             } else if (scmHead instanceof GitHubTagSCMHead) {