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

pr: add /integrate auto #1071

Closed
wants to merge 1 commit into from
Closed

Conversation

edvbld
Copy link
Member

@edvbld edvbld commented Mar 17, 2021

Hi all,

please review this patch that adds the auto and manual arguments to the /integrate pull request command. If a contributor issues /integrate auto then the pull request will be automatically integrated when the pull request is ready (i.e. when jcheck passes). To aid reviewers that this is the case the label "auto" will be added to such pull requests. A contributor can always go back to "manual" mode by issuing the /integrate auto.

This functionality is useful for smaller patches where you are certain that they are correct, for example fixing a typo in a comment. It it also useful for clean backports since most projects consider clean backports ready to be integrated without a review. This allows a backporter to add /integrate auto to the bottom of the PR body for a clean backport and then it will automatically be integrated if it is considered clean.

I also added a bunch of unit tests.

Thanks,
Erik


Progress

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

Reviewers

Download

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

To update a local copy of the PR:
$ git checkout pull/1071
$ git pull https://git.openjdk.java.net/skara pull/1071/head

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 17, 2021

👋 Welcome back ehelin! 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 added the rfr label Mar 17, 2021
@mlbridge
Copy link

mlbridge bot commented Mar 17, 2021

Webrevs

Copy link
Member

@rwestberg rwestberg left a comment

Looks good!

@openjdk
Copy link

openjdk bot commented Mar 17, 2021

@edvbld 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:

pr: add /integrate auto

Reviewed-by: rwestberg

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 4 new commits pushed to the master branch:

  • 0a43128: pr: do not run commit commands when .jcheck/conf is missing
  • 89334c6: pr: add CommitCommandWorkItem.toString
  • 16ca4cb: Construct a proper SSH URI
  • 41e5dff: 627: Review comments are in different order in different e-mails

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this 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 Mar 17, 2021
@edvbld
Copy link
Member Author

edvbld commented Mar 18, 2021

/integrate

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

openjdk bot commented Mar 18, 2021

@edvbld Since your change was applied there have been 6 commits pushed to the master branch:

  • a66ee40: Really fix so tests ignore .gitconfig
  • 0cf4834: Decrease log level for harmless warning
  • 0a43128: pr: do not run commit commands when .jcheck/conf is missing
  • 89334c6: pr: add CommitCommandWorkItem.toString
  • 16ca4cb: Construct a proper SSH URI
  • 41e5dff: 627: Review comments are in different order in different e-mails

Your commit was automatically rebased without conflicts.

Pushed as commit 77cbb92.

💡 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