Closed olenagerasimova closed 5 years ago
This pull request #46 is assigned to @victornoel/z, here is why; the budget is 15 minutes, see §4; please, read §27 and when you decide to accept the changes, inform @g4s8/z (the architect) right in this ticket; if you decide that this PR should not be accepted ever, also inform the architect; this blog post will help you understand what is expected from a code reviewer; there will be no monetary reward for this job
@victornoel some small fixes and todos
@olenagerasimova thanks
@g4s8 I will let you see what to do with this PR, I don't feel comfortable with it because it introduces many things and each would deserve improvement. Todos were added, if this is enough for you, then this can be merged.
@rultor merge
@rultor merge
@g4s8 OK, I'll try to merge now. You can check the progress of the merge here
@rultor merge
@g4s8 @olenagerasimova Oops, I failed. You can see the full log here (spent 2min)
+ fork=git@github.com:olenagerasimova/ghman.git
+ fork_branch=11
+ squash=false
+ vars=('--env=MAVEN_OPTS=-Xmx1g' '--env=head=git@github.com:g4s8/ghman.git' '--env=pull_id=46' '--env=fork=git@github.com:olenagerasimova/ghman.git' '--env=fork_branch=11' '--env=head_branch=master' '--env=pull_title=#11 close issue' '--env=author=g4s8' '--env=scripts=( '\''export '\''\'\'''\''MAVEN_OPTS=-Xmx1g'\''\'\'''\'''\'' '\'';'\'' '\''export '\''\'\'''\''head=git@github.com:g4s8/ghman.git'\''\'\'''\'''\'' '\'';'\'' '\''export '\''\'\'''\''pull_id=46'\''\'\'''\'''\'' '\'';'\'' '\''export '\''\'\'''\''fork=git@github.com:olenagerasimova/ghman.git'\''\'\'''\'''\'' '\'';'\'' '\''export '\''\'\'''\''fork_branch=11'\''\'\'''\'''\'' '\'';'\'' '\''export '\''\'\'''\''head_branch=master'\''\'\'''\'''\'' '\'';'\'' '\''export '\''\'\'''\''pull_title=#11 close issue'\''\'\'''\'''\'' '\'';'\'' '\''export '\''\'\'''\''author=g4s8'\''\'\'''\'''\'' '\'';'\'' '\''mvn install -B -Pqulice'\'' '\'';'\'' '\''pdd --source=$(pwd) --verbose --file=/dev/null'\'' '\'';'\'' )')
+ scripts=('export '\''MAVEN_OPTS=-Xmx1g'\''' ';' 'export '\''head=git@github.com:g4s8/ghman.git'\''' ';' 'export '\''pull_id=46'\''' ';' 'export '\''fork=git@github.com:olenagerasimova/ghman.git'\''' ';' 'export '\''fork_branch=11'\''' ';' 'export '\''head_branch=master'\''' ';' 'export '\''pull_title=#11 close issue'\''' ';' 'export '\''author=g4s8'\''' ';' 'mvn install -B -Pqulice' ';' 'pdd --source=$(pwd) --verbose --file=/dev/null' ';')
+ container=g4s8_ghman_46
+ as_root=false
+ mkdir -p /home/rultor/.ssh
+ echo -e 'Host github.com\n\tStrictHostKeyChecking no\n'
+ chmod 600 /home/rultor/.ssh/config
+ git clone git@github.com:g4s8/ghman.git repo
Cloning into 'repo'...
+ cd repo
+ git config user.email me@rultor.com
+ git config user.name rultor
+ '[' -z 'export '\''MAVEN_OPTS=-Xmx1g'\''' ']'
+ cd ..
+ cat
+ '[' false = true ']'
+ cat
+ chmod a+x entry.sh
+ cat
+ echo 'export '\''MAVEN_OPTS=-Xmx1g'\''' ';' 'export '\''head=git@github.com:g4s8/ghman.git'\''' ';' 'export '\''pull_id=46'\''' ';' 'export '\''fork=git@github.com:olenagerasimova/ghman.git'\''' ';' 'export '\''fork_branch=11'\''' ';' 'export '\''head_branch=master'\''' ';' 'export '\''pull_title=#11 close issue'\''' ';' 'export '\''author=g4s8'\''' ';' 'mvn install -B -Pqulice' ';' 'pdd --source=$(pwd) --verbose --file=/dev/null' ';'
+ rm -rf .gpg
+ cd repo
+ git remote add fork git@github.com:olenagerasimova/ghman.git
+ git remote update
Fetching origin
Fetching fork
From github.com:olenagerasimova/ghman
* [new branch] 11 -> fork/11
* [new branch] 19 -> fork/19
* [new branch] 20 -> fork/20
* [new branch] master -> fork/master
+ args=
+ '[' no == default ']'
+ '[' no == no ']'
+ args=' --no-ff'
+ '[' no == only ']'
+ export BRANCH=__rultor
+ BRANCH=__rultor
++ git show-branch __rultor
++ wc -l
+ '[' 0 -gt 0 ']'
+ git checkout -B __rultor fork/11
Switched to a new branch '__rultor'
Branch __rultor set up to track remote branch 11 from fork.
+ git checkout -B master origin/master
Switched to and reset branch 'master'
Branch master set up to track remote branch master from origin.
Your branch is up-to-date with 'origin/master'.
+ '[' false == true ']'
+ '[' false == true ']'
+ git merge --no-ff __rultor
Auto-merging src/main/java/com/g4s8/ghman/bot/TkThread.java
CONFLICT (content): Merge conflict in src/main/java/com/g4s8/ghman/bot/TkThread.java
Auto-merging src/main/java/com/g4s8/ghman/bot/BotApp.java
CONFLICT (content): Merge conflict in src/main/java/com/g4s8/ghman/bot/BotApp.java
Automatic merge failed; fix conflicts and then commit the result.
'cid' file is absent, container wasn't started correctly
@g4s8 I've merged master, try again please
@g4s8 ping
@rultor merge
@rultor merge
@g4s8 OK, I'll try to merge now. You can check the progress of the merge here
@0crat quality good
As requested in #11 I've implemented telegram take to close issue and unit test for it.