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

merge-bot: specs can have prerequisites #604

Closed
wants to merge 1 commit into from

Conversation

edvbld
Copy link
Member

@edvbld edvbld commented Apr 27, 2020

Hi all,

please review this pull request that allows specifications for the merge bot to
have other repositories as prerequisites. Having a repository as a prerequisite
mean that the specification will not be executed if a repository that is a
prerequisite has any pull requests open due to automatic merge conflicts.

Testing:

  • make test passes on Linux x64
  • added a new unit test

Thanks,
Erik


Progress

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

Reviewers

Download

$ git fetch https://git.openjdk.java.net/skara pull/604/head:pull/604
$ git checkout pull/604

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 27, 2020

👋 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.

Copy link
Member

@rwestberg rwestberg left a comment

Looks good!

@mlbridge
Copy link

mlbridge bot commented Apr 27, 2020

Webrevs

@openjdk
Copy link

openjdk bot commented Apr 27, 2020

@edvbld This change now passes all automated pre-integration checks. When the change also fulfills all project specific requirements, type /integrate in a new comment to proceed. After integration, the commit message will be:

merge-bot: specs can have prerequisites

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

Since the source branch of this PR was last updated there have been 2 commits pushed to 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 automatic rebasing, please merge master into your branch, and then specify the current head hash when integrating, like this: /integrate db5254e5a7d9805cd138b3cfb4faf78a4cb305bf.

➡️ 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 Apr 27, 2020
@edvbld
Copy link
Member Author

edvbld commented Apr 27, 2020

Thanks Robin for reviewing!

@edvbld
Copy link
Member Author

edvbld commented Apr 27, 2020

/integrate

@openjdk openjdk bot closed this Apr 27, 2020
@openjdk openjdk bot added integrated and removed ready labels Apr 27, 2020
@openjdk
Copy link

openjdk bot commented Apr 27, 2020

@edvbld The following commits have been pushed to master since your change was applied:

  • db5254e: 376: Link to commits when number of commits exceeds 10
  • 9bf3f5c: 382: List commits that have been pushed in integration message

Your commit was automatically rebased without conflicts.

Pushed as commit 0c2920e.

@openjdk openjdk bot removed the rfr label Apr 27, 2020
@mlbridge
Copy link

mlbridge bot commented Apr 27, 2020

Mailing list message from Erik Helin on skara-dev:

Changeset: 0c2920e
Author: Erik Helin <ehelin at openjdk.org>
Date: 2020-04-27 11:57:43 +0000
URL: https://git.openjdk.java.net/skara/commit/0c2920e3

merge-bot: specs can have prerequisites

Reviewed-by: rwestberg

! bots/merge/src/main/java/org/openjdk/skara/bots/merge/MergeBot.java
! bots/merge/src/main/java/org/openjdk/skara/bots/merge/MergeBotFactory.java
! bots/merge/src/test/java/org/openjdk/skara/bots/merge/MergeBotTests.java

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