diff --git a/bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java b/bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java index 567295fbb..2ebba74a9 100644 --- a/bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java +++ b/bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java @@ -302,7 +302,8 @@ private Optional getContributorsList(List comments) { private String getStatusMessage(List comments, List reviews, PullRequestCheckIssueVisitor visitor) { var progressBody = new StringBuilder(); - progressBody.append("## Progress\n"); + progressBody.append("---------"); + progressBody.append("### Progress\n"); progressBody.append(getChecksList(visitor)); var issue = Issue.fromString(pr.title()); @@ -311,13 +312,14 @@ private String getStatusMessage(List comments, List reviews, Pu var allIssues = new ArrayList(); allIssues.add(issue.get()); allIssues.addAll(SolvesTracker.currentSolved(pr.repository().forge().currentUser(), comments)); - progressBody.append("\n\n## Issue"); + progressBody.append("\n\n### Issue"); if (allIssues.size() > 1) { progressBody.append("s"); } progressBody.append("\n"); for (var currentIssue : allIssues) { var iss = issueProject.issue(currentIssue.id()); + progressBody.append(" * "); if (iss.isPresent()) { progressBody.append("["); progressBody.append(iss.get().id()); @@ -335,18 +337,28 @@ private String getStatusMessage(List comments, List reviews, Pu } getReviewersList(reviews).ifPresent(reviewers -> { - progressBody.append("\n\n## Reviewers\n"); + progressBody.append("\n\n### Reviewers\n"); progressBody.append(reviewers); }); getContributorsList(comments).ifPresent(contributors -> { - progressBody.append("\n\n## Contributors\n"); + progressBody.append("\n\n### Contributors\n"); progressBody.append(contributors); }); + progressBody.append("\n\n### Download\n"); + progressBody.append(checkoutCommands()); + return progressBody.toString(); } + private String checkoutCommands() { + var repoUrl = pr.repository().webUrl(); + return + "`$ git fetch " + repoUrl + " " + pr.fetchRef() + ":pull/" + pr.id() + "`\n" + + "`$ git checkout pull/" + pr.id() + "`\n"; + } + private String updateStatusMessage(String message) { var description = pr.body(); var markerIndex = description.lastIndexOf(progressMarker); diff --git a/bots/pr/src/test/java/org/openjdk/skara/bots/pr/ContributorTests.java b/bots/pr/src/test/java/org/openjdk/skara/bots/pr/ContributorTests.java index 93f3bf4e9..7b870ef6c 100644 --- a/bots/pr/src/test/java/org/openjdk/skara/bots/pr/ContributorTests.java +++ b/bots/pr/src/test/java/org/openjdk/skara/bots/pr/ContributorTests.java @@ -332,7 +332,7 @@ void prBodyUpdates(TestInfo testInfo) throws IOException { var contributorsHeaderIndex = -1; for (var i = 0; i < body.length; i++) { var line = body[i]; - if (line.equals("## Contributors")) { + if (line.equals("### Contributors")) { contributorsHeaderIndex = i; break; } @@ -352,7 +352,7 @@ void prBodyUpdates(TestInfo testInfo) throws IOException { // Verify that body does not contain "Contributors" section for (var line : pr.body().split("\n")) { - assertNotEquals("## Contributors", line); + assertNotEquals("### Contributors", line); } } }