Skip to content

1563: The method 'CheckRun#updateMergeReadyComment' shouldn't update the comment if the comment has not changed #1386

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
+13 −4
Closed

1563: The method 'CheckRun#updateMergeReadyComment' shouldn't update the comment if the comment has not changed #1386

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f17c80d
do not update comment if the comment already exists
zhaosongzs Sep 29, 2022
6a4c1f2
Adjusted anonther update method in CheckRun#updateMergeReadyComment
zhaosongzs Sep 30, 2022
3021e80
dummy commit to see whether the macOS test fail is occasional
zhaosongzs Sep 30, 2022
0bd093a
Adjusted some log
zhaosongzs Oct 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java
View file
Original file line number Diff line number Diff line change
@@ -931,14 +931,18 @@ private void updateMergeReadyComment(boolean isReady, String commitMessage, bool
log.info("Adding merge ready comment");
pr.addComment(message);
} else {
log.info("Updating merge ready comment");
pr.updateComment(existing.get().id(), message);
if (!existing.get().body().equals(message)) {
log.info("Updating merge ready comment");
pr.updateComment(existing.get().id(), message);
} else {
log.info("Merge ready comment already exists, no need to update the comment");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
log.info("Merge ready comment already exists, no need to update the comment");
log.info("Merge ready comment already exists, no need to update");

}
}
} else if (existing.isPresent()) {
String noLongerReadyComment = getMergeNoLongerReadyComment();
if (!existing.get().body().equals(noLongerReadyComment)) {
log.info("Updating merge ready comment as no longer ready");
pr.updateComment(existing.get().id(), noLongerReadyComment);
var message = getMergeNoLongerReadyComment();
if (!existing.get().body().equals(message)) {
log.info("Updating no longer ready comment");
pr.updateComment(existing.get().id(), message);
} else {
log.info("No longer ready comment already exists, no need to update the comment");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
log.info("No longer ready comment already exists, no need to update the comment");
log.info("No longer ready comment already exists, no need to update");

}