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

PR doesn't closed by Rultor #918

Closed
dmzaytsev opened this issue Aug 12, 2015 · 20 comments
Closed

PR doesn't closed by Rultor #918

dmzaytsev opened this issue Aug 12, 2015 · 20 comments
Labels

Comments

@dmzaytsev
Copy link

dmzaytsev commented Aug 12, 2015

yegor256/netbout#762
Rultor reports about successful merge, but the PR doesn't closed automatically by Rultor and still in open state. What is the reason? Should I close it manually?


@yegor256
Copy link
Owner

@dmzaytsev I don't know why it's happening, but sometimes (very rarely) I see that. Github, for some reason, doesn't close the pull request. It thinks that the merge didn't happen. I think we have to check the status of the PR from Rultor and close it.

@yegor256 yegor256 added the bug label Aug 12, 2015
@alex-palevsky
Copy link
Contributor

@dmzaytsev we will find someone to do this task, soon

@alex-palevsky
Copy link
Contributor

@dmzaytsev I set the milestone to 2.0 since there is nothing set yet

@alex-palevsky alex-palevsky added this to the 2.0 milestone Aug 13, 2015
@alex-palevsky
Copy link
Contributor

@dmzaytsev thanks for the report, I topped your acc for 15 mins, payment ID 63019370

@original-brownbear
Copy link
Contributor

@dmzaytsev this was now discussed in #1001, but to properly summarize it here for the person dealing with it eventually:

  • This hapens when the merge involves a rebase and it would have not been possible for the merge to be fast forwarded without that rebase.
    • Put differently, this happens when the commit hashes on the branch change due to the rebase.

Fix must include:

The agree upon solution in #1001 that needs to be implemented here specifies what needs to be done here:

  • IF the rebase option is set to true, this needs to happen:
    • Rultor rebases then --ff merges ( already done )
    • Rultor closes the PR ( needs implementation)
    • Rultor posts a message to the ticket explaining that the PR was merged despite the closed state, but not set to "merged" as a result of the merge having needed a rebase.

@alex-palevsky
Copy link
Contributor

@vkuchyn This task is yours, please go ahead keeping in mind this. If any questions, don't hesitate to ask right here... 30 mins is the budget of the task. This is exactly how much will be paid when the problem is solved (no matter how much time you will actually spend). See this for more information

@vkuchyn
Copy link
Contributor

vkuchyn commented Mar 9, 2016

@original-brownbear

IF the rebase option is set to true, this needs to happen:

You mean rebase option in merge block, described in .rultor.yml?
Can you explain what is that flag for?

@original-brownbear
Copy link
Contributor

@vkuchyn check out the documentation here all there at the bottom in Merge, Deploy, Release :)
EDIT: Oh but yes I mean the merge block option, sorry :)

@vkuchyn
Copy link
Contributor

vkuchyn commented Mar 9, 2016

@original-brownbear thanks.
One more question - to clarify the whole picture. After merge rultor pushes changes to github and github automatically closes PR (it's feature). But when use rebase instead merge before push - we need to close PR manually, as far as github's logic doesn't support such case. Am I correct in problem vision?

@original-brownbear
Copy link
Contributor

@vkuchyn yes, spot on :)

@vkuchyn
Copy link
Contributor

vkuchyn commented Mar 9, 2016

@original-brownbear I have a question about design and conventions. In rultor we have a chain of agents (implements interface Agent) that have method proceed that returns list of directives to modify talk. I missunderstood what is it for? When do I need to change somehow talk in my agent and when not?

@original-brownbear
Copy link
Contributor

@vkuchyn You got the general idea right I think :)

When do I need to change somehow talk in my agent and when not?

Not sure what kind of answer you are aiming at here. I mean, yes you're passing around data via the Directives. And yes those are used by Agents to extract data from.
So I mean you want to change those directives in case the next thing handling them needs some information passed on to it.
But I mean this task does not really require you to do any sort of tricky modification to existing functionality here, simply identify those rebase cases, then fire off logic from there that posts the answer + closes the PR.
How you do it is, so long as you respect our coding standards and have proper tests for your fix up to you for the most part :)

vkuchyn added a commit to vkuchyn/rultor that referenced this issue Mar 10, 2016
vkuchyn added a commit to vkuchyn/rultor that referenced this issue Mar 10, 2016
vkuchyn added a commit to vkuchyn/rultor that referenced this issue Mar 10, 2016
@vkuchyn vkuchyn mentioned this issue Mar 10, 2016
@vkuchyn
Copy link
Contributor

vkuchyn commented Mar 10, 2016

@alex-palevsky fixed in #1049 Please, find someone for review

@alex-palevsky
Copy link
Contributor

@alex-palevsky fixed in #1049 Please, find someone for review

@vkuchyn thank you!

vkuchyn added a commit to vkuchyn/rultor that referenced this issue Mar 11, 2016
vkuchyn added a commit to vkuchyn/rultor that referenced this issue Mar 11, 2016
vkuchyn added a commit to vkuchyn/rultor that referenced this issue Mar 11, 2016
vkuchyn added a commit to vkuchyn/rultor that referenced this issue Mar 11, 2016
vkuchyn added a commit to vkuchyn/rultor that referenced this issue Mar 11, 2016
rultor pushed a commit that referenced this issue Mar 11, 2016
rultor pushed a commit that referenced this issue Mar 11, 2016
rultor pushed a commit that referenced this issue Mar 11, 2016
rultor pushed a commit that referenced this issue Mar 11, 2016
rultor pushed a commit that referenced this issue Mar 11, 2016
rultor pushed a commit that referenced this issue Mar 11, 2016
@alex-palevsky
Copy link
Contributor

@dmzaytsev once 918-89660440 puzzle is resolved (later, in another ticket), this ticket will be fully complete

@vkuchyn
Copy link
Contributor

vkuchyn commented Mar 12, 2016

@dmzaytsev please, close this ticket - merged in #1049

@dmzaytsev
Copy link
Author

@vkuchyn thanks

@alex-palevsky
Copy link
Contributor

@vkuchyn Thank you, I have added 30 mins to your account in payment/transaction "80118889", time consumed: 215 hours and 34 mins; +30 to your rating, your total score is +150

@alex-palevsky
Copy link
Contributor

@dmzaytsev the last puzzle 918-89660440/#1056 solved

@0pdd
Copy link
Collaborator

0pdd commented Jul 11, 2022

@dmzaytsev the puzzle #1376 is still not solved.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

No branches or pull requests

6 participants