Merge pull request #237 from gsmet/prepare-langchain4j

Make the config a bit more flexible
quarkusio · Nov 8, 2024 · d7fc66e · d7fc66e
2 parents 95d501b + 95697c9
commit d7fc66e
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 5 deletions.
diff --git a/...ithub-actions/src/main/java/io/quarkus/bot/buildreporter/githubactions/BuildReporter.java b/...ithub-actions/src/main/java/io/quarkus/bot/buildreporter/githubactions/BuildReporter.java
@@ -36,7 +36,7 @@ public class BuildReporter {
     WorkflowReportFormatter workflowReportFormatter;
 
     @Inject
-    WorkflowReportJobIncludeStrategy workflowReportJobIncludeStrategy;
+    WorkflowReportJobIncludeStrategy globalWorkflowReportJobIncludeStrategy;
 
     @Inject
     StackTraceShortener stackTraceShortener;
@@ -57,6 +57,10 @@ public Optional<String> generateReportComment(String workflowName,
         String statusCommentMarker = workflowName == null ? WorkflowConstants.MESSAGE_ID_ACTIVE
                 : getActiveStatusCommentMarker(workflowName);
 
+        WorkflowReportJobIncludeStrategy workflowReportJobIncludeStrategy = buildReporterConfig
+                .getWorkflowReportJobIncludeStrategy() != null ? buildReporterConfig.getWorkflowReportJobIncludeStrategy()
+                        : globalWorkflowReportJobIncludeStrategy;
+
         String reportComment = workflowReportFormatter.getReportComment(workflowReport,
                 artifactsAvailable,
                 checkRunOptional.orElse(null),
@@ -126,6 +130,10 @@ public Optional<GHCheckRun> createCheckRun(GHWorkflowRun workflowRun,
             return Optional.empty();
         }
 
+        WorkflowReportJobIncludeStrategy workflowReportJobIncludeStrategy = buildReporterConfig
+                .getWorkflowReportJobIncludeStrategy() != null ? buildReporterConfig.getWorkflowReportJobIncludeStrategy()
+                        : globalWorkflowReportJobIncludeStrategy;
+
         try {
             String name = WorkflowConstants.BUILD_SUMMARY_CHECK_RUN_PREFIX + workflowRun.getHeadSha();
             String summary = workflowReportFormatter.getCheckRunReportSummary(workflowReport, workflowContext,

diff --git a/...actions/src/main/java/io/quarkus/bot/buildreporter/githubactions/BuildReporterConfig.java b/...actions/src/main/java/io/quarkus/bot/buildreporter/githubactions/BuildReporterConfig.java
@@ -6,19 +6,24 @@
 
 import org.kohsuke.github.GHWorkflowJob;
 
+import io.quarkus.bot.buildreporter.githubactions.report.WorkflowReportJobIncludeStrategy;
+
 public class BuildReporterConfig {
 
     private final boolean dryRun;
+    private final WorkflowReportJobIncludeStrategy workflowReportJobIncludeStrategy;
     private final Comparator<GHWorkflowJob> workflowJobComparator;
     private final Set<String> monitoredWorkflows;
     private final boolean createCheckRun;
     private final boolean develocityEnabled;
     private final String develocityUrl;
 
-    private BuildReporterConfig(boolean dryRun, Comparator<GHWorkflowJob> workflowJobComparator,
+    private BuildReporterConfig(boolean dryRun, WorkflowReportJobIncludeStrategy workflowReportJobIncludeStrategy,
+            Comparator<GHWorkflowJob> workflowJobComparator,
             Set<String> monitoredWorkflows, boolean createCheckRun, boolean develocityEnabled,
             String develocityUrl) {
         this.dryRun = dryRun;
+        this.workflowReportJobIncludeStrategy = workflowReportJobIncludeStrategy;
         this.workflowJobComparator = workflowJobComparator;
         this.monitoredWorkflows = monitoredWorkflows;
         this.createCheckRun = createCheckRun;
@@ -30,6 +35,10 @@ public boolean isDryRun() {
         return dryRun;
     }
 
+    public WorkflowReportJobIncludeStrategy getWorkflowReportJobIncludeStrategy() {
+        return workflowReportJobIncludeStrategy;
+    }
+
     public Comparator<GHWorkflowJob> getJobNameComparator() {
         return workflowJobComparator;
     }
@@ -58,7 +67,8 @@ public static class Builder {
 
         private boolean dryRun = false;
         private boolean createCheckRun = true;
-        private Comparator<GHWorkflowJob> workflowJobComparator = DefaultJobNameComparator.INSTANCE;
+        private WorkflowReportJobIncludeStrategy workflowReportJobIncludeStrategy;
+        private Comparator<GHWorkflowJob> workflowJobComparator;
         private Set<String> monitoredWorkflows = Collections.emptySet();
         private boolean develocityEnabled;
         private String develocityUrl;
@@ -68,6 +78,11 @@ public Builder dryRun(boolean dryRun) {
             return this;
         }
 
+        public Builder workflowReportJobIncludeStrategy(WorkflowReportJobIncludeStrategy workflowReportJobIncludeStrategy) {
+            this.workflowReportJobIncludeStrategy = workflowReportJobIncludeStrategy;
+            return this;
+        }
+
         public Builder workflowJobComparator(Comparator<GHWorkflowJob> workflowJobComparator) {
             this.workflowJobComparator = workflowJobComparator;
             return this;
@@ -94,8 +109,9 @@ public Builder develocityUrl(String develocityUrl) {
         }
 
         public BuildReporterConfig build() {
-            return new BuildReporterConfig(dryRun, workflowJobComparator, monitoredWorkflows, createCheckRun,
-                    develocityEnabled, develocityUrl);
+            return new BuildReporterConfig(dryRun, workflowReportJobIncludeStrategy,
+                    workflowJobComparator != null ? workflowJobComparator : DefaultJobNameComparator.INSTANCE,
+                    monitoredWorkflows, createCheckRun, develocityEnabled, develocityUrl);
         }
     }