Skip to content
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.

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

1026: Skara bot doesn't update Progress checklist for clean backports to show that it is properly reviewed #1198

Closed

Conversation

erikj79
Copy link
Member

@erikj79 erikj79 commented Jul 14, 2021

When a backport is considered clean, no review is required. This should be reflected in the progress list in the PR body. This patch simply removes the "Change must be properly reviewed" line in that case.


Progress

  • Change must not contain extraneous whitespace
  • Change must be properly reviewed

Issue

  • SKARA-1026: Skara bot doesn't update Progress checklist for clean backports to show that it is properly reviewed

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/skara pull/1198/head:pull/1198
$ git checkout pull/1198

Update a local copy of the PR:
$ git checkout pull/1198
$ git pull https://git.openjdk.java.net/skara pull/1198/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1198

View PR using the GUI difftool:
$ git pr show -t 1198

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/skara/pull/1198.diff

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Jul 14, 2021

👋 Welcome back erikj! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot changed the title SKARA-1026 1026: Skara bot doesn't update Progress checklist for clean backports to show that it is properly reviewed Jul 14, 2021
@openjdk openjdk bot added the rfr label Jul 14, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Jul 14, 2021

Webrevs

Copy link
Member

@kevinrushforth kevinrushforth left a comment

Looks good. I left one minor comment on the name of the new method.

.map(entry -> "- [" + (entry.getValue() ? "x" : " ") + "] " + entry.getKey())
.collect(Collectors.joining("\n"));
private String getChecksList(PullRequestCheckIssueVisitor visitor, boolean isCleanBackport) {
var checks = isCleanBackport ? visitor.getReadyForReviewChecks() : visitor.getChecks();
Copy link
Member

@kevinrushforth kevinrushforth Jul 14, 2021

Choose a reason for hiding this comment

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

I find the name of the new method a little confusing. A clean backport is ready for integration not for review. Maybe just getReadyChecks or getChecksClean? I'll leave it up to you.

Copy link
Member Author

@erikj79 erikj79 Jul 14, 2021

Choose a reason for hiding this comment

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

I understand the confusion. I chose the name to fit in with the current model and naming. When CheckRun evaluates if a cleanBackport PR is ready for integration, it calls PullRequestCheckIssueVisitor.isReadyForReview() (instead of .messages().isEmpty()). So the state we are checking for in the visitor is already named "readyForReview". The new method builds on that and returns the checks that were used to decide if it was readyForReview.

Copy link
Member Author

@erikj79 erikj79 Jul 14, 2021

Choose a reason for hiding this comment

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

I should add that the CheckRun knows about clean backports, while the visitor does not, it just evaluates Jcheck checks and reports on the outcome.

Copy link
Member

@kevinrushforth kevinrushforth Jul 14, 2021

Choose a reason for hiding this comment

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

OK, thanks for the explanation.

@openjdk
Copy link

@openjdk openjdk bot commented Jul 14, 2021

@erikj79 This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

🔍 One or more changes in this pull request modifies files in areas of the source code that often require two reviewers. Please consider if this is the case for this pull request, and if so, await a second reviewer to approve this pull request before you integrate it.

🌎 Applicable reviewers for one or more changes in this pull request are spread across multiple different time zones. Please consider waiting with integrating this pull request until it has been out for review for at least 24 hours to give all reviewers a chance to review the pull request.

After integration, the commit message for the final commit will be:

1026: Skara bot doesn't update Progress checklist for clean backports to show that it is properly reviewed

Reviewed-by: kcr

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready label Jul 14, 2021
@erikj79
Copy link
Member Author

@erikj79 erikj79 commented Jul 15, 2021

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Jul 15, 2021

Going to push as commit be4ddfd.
Since your change was applied there has been 1 commit pushed to the master branch:

  • 36fdc9b: 1101: git webrev for mercurial should ignore config defaults for mercurial commands

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Jul 15, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Jul 15, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Jul 15, 2021

@erikj79 Pushed as commit be4ddfd.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
2 participants