Merge pull request #23 from gsmet/add-more-information-2

Some refinements for added information

Author: gsmet

action.yml

@@ -25,6 +25,9 @@ inputs:
   quarkus-sha:
     description: 'The Git sha of the Quarkus build used to run the tests'
     required: false
+  project-sha:
+    description: 'The Git sha of the project currently under test'
+    required: false
 
 runs:
   using: "composite"

src/main/java/io/quarkus/bot/reportstatus/InputKeys.java

@@ -11,4 +11,5 @@ private InputKeys() {
     static final String REPOSITORY = "repository";
     static final String RUN_ID = "run-id";
     static final String QUARKUS_SHA = "quarkus-sha";
+    static final String PROJECT_SHA = "project-sha";
 }

src/main/java/io/quarkus/bot/reportstatus/ReportStatusInIssue.java

@@ -68,8 +68,10 @@ void reportStatus(Commands commands, Inputs inputs, Context context) throws IOEx
             commands.notice(String.format("The issue is currently %s", issue.getState().toString()));
         }
 
+        String quarkusSha = inputs.get(InputKeys.QUARKUS_SHA).orElse(null);
+        String projectSha = inputs.get(InputKeys.PROJECT_SHA).orElse(null);
         Status existingStatus = extractStatus(issue.getBody());
-        State newState = new State(Instant.now(), context.getGitHubSha(), inputs.get(InputKeys.QUARKUS_SHA).orElse(null));
+        State newState = new State(Instant.now(), quarkusSha, projectSha);
 
         final State firstFailure;
         final State lastFailure;
@@ -100,7 +102,8 @@ void reportStatus(Commands commands, Inputs inputs, Context context) throws IOEx
                 commands.notice(String.format("Comment added on issue %s - %s", issue.getHtmlUrl().toString(),
                         comment.getHtmlUrl().toString()));
 
-                firstFailure = State.KEEP_EXISTING;
+                // for old reports, we won't have the first failure previously set so let's set it to the new state as an approximation
+                firstFailure = existingStatus.firstFailure() != null ? State.KEEP_EXISTING : newState;
             } else {
                 issue.reopen();
                 final GHIssueComment comment = issue.comment(String.format(
@@ -115,12 +118,12 @@ void reportStatus(Commands commands, Inputs inputs, Context context) throws IOEx
 
         Status newStatus;
         if (existingStatus != null) {
-            newStatus = new Status(Instant.now(), !succeed, repositoryName, runId,
+            newStatus = new Status(Instant.now(), !succeed, repositoryName, runId, quarkusSha, projectSha,
                     firstFailure == State.KEEP_EXISTING ? existingStatus.firstFailure() : firstFailure,
                     lastFailure == State.KEEP_EXISTING ? existingStatus.lastFailure() : lastFailure,
                     lastSuccess == State.KEEP_EXISTING ? existingStatus.lastSuccess() : lastSuccess);
         } else {
-            newStatus = new Status(Instant.now(), !succeed, repositoryName, runId,
+            newStatus = new Status(Instant.now(), !succeed, repositoryName, runId, quarkusSha, projectSha,
                     firstFailure, lastFailure, lastSuccess);
         }
 
@@ -164,7 +167,7 @@ public Status extractStatus(String body) {
     }
 
     public record Status(Instant updatedAt, boolean failure, String repository, Long runId,
-                         State firstFailure, State lastFailure, State lastSuccess) {
+             String quarkusSha, String projectSha, State firstFailure, State lastFailure, State lastSuccess) {
     }
 
     public record State(Instant date, String quarkusSha, String projectSha) {