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

Add merge bot #104

Closed
wants to merge 2 commits into from
Closed

Add merge bot #104

wants to merge 2 commits into from

Conversation

@edvbld
Copy link
Member

edvbld commented Aug 29, 2019

Hi,

this patch adds a merge bot. The merge automatically tries to merge a branch from one repository to another. If the merge fails then the bot will open a PR describing the commits that couldn't be merge. Once the conflicts have been resolved and pushed/integrated by a human contributor, then the bot will automatically close the PR.

Testing

  • sh gradlew test passes on Linux x86_64
  • Added four new unit tests

Thanks,
Erik

Progress

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

Approvers

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 29, 2019

👋 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 (refresh this page to view it).

@openjdk openjdk bot added bots build rfr labels Aug 29, 2019
@mlbridge
Copy link

mlbridge bot commented Aug 29, 2019

Webrevs

Copy link
Member

rwestberg left a comment

Looks good, don't need to re-review if you update the merge conflict message!

message.add("```");
message.add("");
message.add("Push the resulting merge conflict to your personal fork and " +
"create a pull request towards this repository. Finally close this pull request " +

This comment has been minimized.

@rwestberg

rwestberg Aug 29, 2019 Member

Since you close the PR automatically, this message should probably be updated.

@openjdk openjdk bot removed the rfr label Aug 29, 2019
@openjdk
Copy link

openjdk bot commented Aug 29, 2019

@edvbld This change can now be integrated. The commit message will be:

Add merge bot

Reviewed-by: rwestberg
  • If you would like to add a summary, use the /summary command.
  • To list additional contributors, use the /contributor command.

Since the source branch of this PR was last updated there has been 1 commit pushed to the master branch:

Your changes cannot be rebased automatically without conflicts, so you will need to merge master into your branch before integrating.

@openjdk openjdk bot added the ready label Aug 29, 2019
@edvbld
Copy link
Member Author

edvbld commented Aug 29, 2019

/integrate

@openjdk openjdk bot closed this Aug 29, 2019
@openjdk openjdk bot added the integrated label Aug 29, 2019
@openjdk
Copy link

openjdk bot commented Aug 29, 2019

@edvbld Pushed as commit 910b2c8.

@openjdk openjdk bot added the outdated label Aug 29, 2019
@edvbld edvbld deleted the edvbld:merge-bot branch Sep 10, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.