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

963: Skara mlbridge bot sometimes resends old messages #1117

Closed
wants to merge 8 commits into from

Conversation

rwestberg
Copy link
Member

@rwestberg rwestberg commented Apr 14, 2021

Avoid parsing the sent mail archive into conversations as we're only interested in the IDs that we have already sent.


Progress

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

Issue

  • SKARA-963: Skara mlbridge bot sometimes resends old messages

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1117

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Apr 14, 2021

👋 Welcome back rwestberg! A progress list of the required criteria for merging this PR into pr/1103 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 963 963: Skara mlbridge bot sometimes resends old messages Apr 14, 2021
@openjdk openjdk bot added the rfr label Apr 14, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Apr 14, 2021

Webrevs

edvbld
edvbld approved these changes Apr 14, 2021
Copy link
Member

@edvbld edvbld left a comment

Looks good!

@openjdk-notifier openjdk-notifier bot changed the base branch from pr/1103 to master Apr 14, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Apr 14, 2021

@rwestberg this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout mlbridge_archive_parse
git fetch https://git.openjdk.java.net/skara master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk
Copy link

@openjdk openjdk bot commented Apr 14, 2021

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

963: Skara mlbridge bot sometimes resends old messages

Reviewed-by: ehelin

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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 ready and removed merge-conflict labels Apr 14, 2021
@rwestberg
Copy link
Member Author

@rwestberg rwestberg commented Apr 14, 2021

/integrate

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

@openjdk openjdk bot commented Apr 14, 2021

@rwestberg Pushed as commit e3b75ff.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

try {
var archiveContents = Files.readString(mboxBasePath.resolve(pr.id() + ".mbox"), StandardCharsets.UTF_8);
sentMails.addAll(Mbox.splitMbox(archiveContents, bot.emailAddress()));
} catch (IOException ignored) {
Copy link
Member

@erikj79 erikj79 Apr 14, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't we at least log this?

Copy link
Member Author

@rwestberg rwestberg Apr 14, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will happen every time a new PR is processed (since there won't be any archive) - I can't think of any actual error that could cause a problem here (problems with the folder contents should have been discovered when cloning it from git)

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