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

1048: Missing integration comment causes mlbridge to throw exceptions #1205

Closed

Conversation

erikj79
Copy link
Member

@erikj79 erikj79 commented Jul 16, 2021

This patch changes the mlbridge bot to stop throwing errors when it encounters a PR marked as integrated but without the integration comment (which contains the information about the commit hash needed for the email). Instead, it's just logged and no action is taken. When the comment is eventually added, the bot will run again and the email will be sent.

The ordering of actions from the PR bot must unfortunately be like it is, with the comment added last.


Progress

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

Issue

  • SKARA-1048: Missing integration comment causes mlbridge to throw exceptions

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1205

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Jul 16, 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-1048 1048: Missing integration comment causes mlbridge to throw exceptions Jul 16, 2021
@openjdk openjdk bot added the rfr label Jul 16, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Jul 16, 2021

Webrevs

@openjdk
Copy link

@openjdk openjdk bot commented Jul 16, 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.

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

1048: Missing integration comment causes mlbridge to throw exceptions

Reviewed-by: kcr, ihse

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:

  • 82a5861: 1133: Source branch for /backport PRs is outdated
  • 47943b0: 1128: mailing list thread comments aren't being registered in github PR
  • 9e1ba0e: 1123: mailing list rule for openjdk/src/hotspot/share/cds/
  • ef31e0b: Update jdk.json to include XML Signature tests

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 Jul 16, 2021
@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Aug 6, 2021

@erikj79 This pull request has been inactive for more than 3 weeks and will be automatically closed if another 3 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

@kevinrushforth
Copy link
Member

@kevinrushforth kevinrushforth commented Aug 9, 2021

This is a dummy comment to prevent auto-closure.

@erikj79
Copy link
Member Author

@erikj79 erikj79 commented Aug 30, 2021

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Aug 30, 2021

Going to push as commit e8336a4.
Since your change was applied there have been 4 commits pushed to the master branch:

  • 82a5861: 1133: Source branch for /backport PRs is outdated
  • 47943b0: 1128: mailing list thread comments aren't being registered in github PR
  • 9e1ba0e: 1123: mailing list rule for openjdk/src/hotspot/share/cds/
  • ef31e0b: Update jdk.json to include XML Signature tests

Your commit was automatically rebased without conflicts.

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

@openjdk openjdk bot commented Aug 30, 2021

@erikj79 Pushed as commit e8336a4.

💡 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
3 participants