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

jcheck: make merge committers configurable #494

Closed
wants to merge 1 commit into from

Conversation

edvbld
Copy link
Member

@edvbld edvbld commented Mar 4, 2020

Hi all,

please review this patch that adds an additional configuration to the
"committers" check. We now support setting usernames that are allowed to be
committers of merge commits even though they are not part of the project. This
is useful for allowing automated merge commits to pass jcheck.

Testing:

  • make test passes on Linux x64
  • Added two new unit tests

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/494/head:pull/494
$ git checkout pull/494

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 4, 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.

@openjdk openjdk bot added the rfr label Mar 4, 2020
@mlbridge
Copy link

mlbridge bot commented Mar 4, 2020

Webrevs

Copy link
Member

@rwestberg rwestberg left a comment

Looks good as well!

@openjdk
Copy link

openjdk bot commented Mar 4, 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:

jcheck: make merge committers configurable

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 3 commits pushed to the master branch. Since 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 de5f4b5c8796c419117fb77c12df3809c49a752b.

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

@openjdk openjdk bot added the ready label Mar 4, 2020
@edvbld
Copy link
Member Author

edvbld commented Mar 5, 2020

/integrate

@openjdk openjdk bot closed this Mar 5, 2020
@openjdk openjdk bot added integrated and removed ready labels Mar 5, 2020
@openjdk
Copy link

openjdk bot commented Mar 5, 2020

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

  • 0ef146d: jcheck: allow pattern for merge commit messages
  • 07f98f6: jcheck: always reload configuration

Your commit was automatically rebased without conflicts.

Pushed as commit de5f4b5.

@openjdk openjdk bot removed the rfr label Mar 5, 2020
@mlbridge
Copy link

mlbridge bot commented Mar 5, 2020

Mailing list message from Erik Helin on skara-dev:

Changeset: de5f4b5
Author: Erik Helin <ehelin at openjdk.org>
Date: 2020-03-05 07:35:15 +0000
URL: https://git.openjdk.java.net/skara/commit/de5f4b5c

jcheck: make merge committers configurable

Reviewed-by: rwestberg

! jcheck/src/main/java/org/openjdk/skara/jcheck/CommitterCheck.java
! jcheck/src/main/java/org/openjdk/skara/jcheck/CommitterConfiguration.java
! jcheck/src/test/java/org/openjdk/skara/jcheck/CommitterCheckTests.java

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