Merge pull request #14 from gsmet/output-version

Add output for released version
quarkusio · Nov 25, 2023 · e21377d · e21377d
2 parents 78aab0b + 6d98071
commit e21377d
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/action.yml b/action.yml
@@ -15,6 +15,8 @@ outputs:
     value: ${{ steps.action.outputs.workflow-run-id }}
   interaction-comment:
     value: ${{ steps.action.outputs.interaction-comment }}
+  version:
+    value: ${{ steps.action.outputs.version }}
 runs:
   using: "composite"
   steps:

diff --git a/src/main/java/io/quarkus/bot/release/ReleaseAction.java b/src/main/java/io/quarkus/bot/release/ReleaseAction.java
@@ -75,8 +75,14 @@ void startRelease(Context context, Commands commands, @Issue.Opened GHEventPaylo
 
         react(commands, issue, ReactionContent.PLUS_ONE);
 
-        handleSteps(context, commands, issuePayload.getIssue(), updatedIssueBody, null, releaseInformation,
-                new ReleaseStatus(Status.STARTED, Step.PREREQUISITES, StepStatus.STARTED, context.getGitHubRunId()));
+        try {
+            handleSteps(context, commands, issuePayload.getIssue(), updatedIssueBody, null, releaseInformation,
+                    new ReleaseStatus(Status.STARTED, Step.PREREQUISITES, StepStatus.STARTED, context.getGitHubRunId()));
+        } finally {
+            if (releaseInformation.getVersion() != null) {
+                commands.setOutput(Outputs.VERSION, releaseInformation.getVersion());
+            }
+        }
     }
 
     @Action
@@ -107,7 +113,13 @@ void onComment(Context context, Commands commands, @IssueComment.Created GHEvent
             throw e;
         }
 
-        handleSteps(context, commands, issue, updatedIssueBody, issueComment, releaseInformation, releaseStatus);
+        try {
+            handleSteps(context, commands, issue, updatedIssueBody, issueComment, releaseInformation, releaseStatus);
+        } finally {
+            if (releaseInformation.getVersion() != null) {
+                commands.setOutput(Outputs.VERSION, releaseInformation.getVersion());
+            }
+        }
     }
 
     private void handleSteps(Context context, Commands commands, GHIssue issue, UpdatedIssueBody updatedIssueBody,

diff --git a/src/main/java/io/quarkus/bot/release/step/Prerequisites.java b/src/main/java/io/quarkus/bot/release/step/Prerequisites.java
@@ -62,7 +62,7 @@ public int run(Context context, Commands commands, ReleaseInformation releaseInf
             comment.append("- This is a preview release (e.g. `Alpha`, `Beta`, `CR`).\n");
         }
         comment.append(
-                "\nPlease add a `" + Command.YES.getFullCommand() + "` comment if you want to pursue with the release.\n");
+                "\nPlease approve with a `" + Command.YES.getFullCommand() + "` comment if you want to pursue with the release.\n");
         comment.append("\nIf not, simply close this issue.");
         commands.setOutput(Outputs.INTERACTION_COMMENT, comment.toString());
 

diff --git a/src/main/java/io/quarkus/bot/release/util/Outputs.java b/src/main/java/io/quarkus/bot/release/util/Outputs.java
@@ -4,6 +4,7 @@ public final class Outputs {
 
     public static final String WORKFLOW_RUN_ID = "workflow-run-id";
     public static final String INTERACTION_COMMENT = "interaction-comment";
+    public static final String VERSION = "version";
 
     private Outputs() {
     }