myunusov / maxur-base

See project documentation on
http://myunusov.github.io/maxur-base/
Apache License 2.0
1 stars 0 forks source link

0.17 #48

Closed myunusov closed 8 years ago

myunusov commented 8 years ago

@rultor merge and deploy it

rultor commented 8 years ago

@rultor merge and deploy it

@myunusov OK, I'll try to merge now. You can check the progress of the merge here

rultor commented 8 years ago

@rultor merge and deploy it

@myunusov Oops, I failed. You can see the full log here (spent 13s)

gpg: original file name='secring.gpg'
gpg: WARNING: message was not integrity protected
+ rm -rf secring.gpg.enc
+ rm -rf .gpg
+ cd repo
+ git remote add fork git@github.com:myunusov/maxur-base.git
+ git remote update
Fetching origin
Fetching fork
From github.com:myunusov/maxur-base
 * [new branch]      0.16       -> fork/0.16
 * [new branch]      0.17       -> fork/0.17
 * [new branch]      gh-pages   -> fork/gh-pages
 * [new branch]      master     -> fork/master
+ args=
+ '[' default == default ']'
+ args=' --ff'
+ '[' default == no ']'
+ '[' default == only ']'
+ export BRANCH=__rultor
+ BRANCH=__rultor
++ git show-branch __rultor
++ wc -l
+ '[' 0 -gt 0 ']'
+ git checkout -B __rultor fork/0.17
Switched to a new branch '__rultor'
Branch __rultor set up to track remote branch 0.17 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.
+ '[' false == true ']'
+ '[' false == true ']'
+ git merge --ff __rultor
Auto-merging pom.xml
Merge made by the 'recursive' strategy.
 .gitignore |  1 +
 README.md  | 51 +++++++++++++++++++++++++++++++++------------------
 pom.xml    | 22 ++++++++++++++++++++--
 3 files changed, 54 insertions(+), 20 deletions(-)
+ docker_when_possible
+ true
++ uptime
++ sed 's/ /\n/g'
++ tail -n 1
+ load=0.21
++ echo 0.21 '>' 30
++ bc
+ '[' 0 -eq 1 ']'
+ echo 'load average is 0.21, low enough to run a new Docker container'
load average is 0.21, low enough to run a new Docker container
+ break
+ cd ..
+ '[' -n '' ']'
+ use_image=maxur/maxur-dev
+ docker pull maxur/maxur-dev
Using default tag: latest
Warning: failed to get default registry endpoint from daemon (Cannot connect to the Docker daemon. Is the docker daemon running on this host?). Using system default: https://index.docker.io/v1/
Cannot connect to the Docker daemon. Is the docker daemon running on this host?
'cid' file is absent, container wasn't started correctly
myunusov commented 8 years ago

@rultor merge

rultor commented 8 years ago

@rultor merge

@myunusov OK, I'll try to merge now. You can check the progress of the merge here

rultor commented 8 years ago

@rultor merge

@myunusov Oops, I failed. You can see the full log here (spent 1min)

gpg: original file name='secring.gpg'
gpg: WARNING: message was not integrity protected
+ rm -rf secring.gpg.enc
+ rm -rf .gpg
+ cd repo
+ git remote add fork git@github.com:myunusov/maxur-base.git
+ git remote update
Fetching origin
Fetching fork
From github.com:myunusov/maxur-base
 * [new branch]      0.16       -> fork/0.16
 * [new branch]      0.17       -> fork/0.17
 * [new branch]      gh-pages   -> fork/gh-pages
 * [new branch]      master     -> fork/master
+ args=
+ '[' default == default ']'
+ args=' --ff'
+ '[' default == no ']'
+ '[' default == only ']'
+ export BRANCH=__rultor
+ BRANCH=__rultor
++ git show-branch __rultor
++ wc -l
+ '[' 0 -gt 0 ']'
+ git checkout -B __rultor fork/0.17
Switched to a new branch '__rultor'
Branch __rultor set up to track remote branch 0.17 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.
+ '[' false == true ']'
+ '[' false == true ']'
+ git merge --ff __rultor
Auto-merging pom.xml
Merge made by the 'recursive' strategy.
 .gitignore |  1 +
 README.md  | 51 +++++++++++++++++++++++++++++++++------------------
 pom.xml    | 22 ++++++++++++++++++++--
 3 files changed, 54 insertions(+), 20 deletions(-)
+ docker_when_possible
+ true
++ uptime
++ sed 's/ /\n/g'
++ tail -n 1
+ load=0.19
++ echo 0.19 '>' 30
++ bc
+ '[' 0 -eq 1 ']'
+ echo 'load average is 0.19, low enough to run a new Docker container'
load average is 0.19, low enough to run a new Docker container
+ break
+ cd ..
+ '[' -n '' ']'
+ use_image=maxur/maxur-dev
+ docker pull maxur/maxur-dev
Using default tag: latest
Warning: failed to get default registry endpoint from daemon (Cannot connect to the Docker daemon. Is the docker daemon running on this host?). Using system default: https://index.docker.io/v1/
Cannot connect to the Docker daemon. Is the docker daemon running on this host?
'cid' file is absent, container wasn't started correctly
myunusov commented 8 years ago

@rultor merge

rultor commented 8 years ago

@rultor merge

@myunusov OK, I'll try to merge now. You can check the progress of the merge here

rultor commented 8 years ago

@rultor merge

@myunusov Oops, I failed. You can see the full log here (spent 12s)

gpg: original file name='secring.gpg'
gpg: WARNING: message was not integrity protected
+ rm -rf secring.gpg.enc
+ rm -rf .gpg
+ cd repo
+ git remote add fork git@github.com:myunusov/maxur-base.git
+ git remote update
Fetching origin
Fetching fork
From github.com:myunusov/maxur-base
 * [new branch]      0.16       -> fork/0.16
 * [new branch]      0.17       -> fork/0.17
 * [new branch]      gh-pages   -> fork/gh-pages
 * [new branch]      master     -> fork/master
+ args=
+ '[' default == default ']'
+ args=' --ff'
+ '[' default == no ']'
+ '[' default == only ']'
+ export BRANCH=__rultor
+ BRANCH=__rultor
++ git show-branch __rultor
++ wc -l
+ '[' 0 -gt 0 ']'
+ git checkout -B __rultor fork/0.17
Switched to a new branch '__rultor'
Branch __rultor set up to track remote branch 0.17 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.
+ '[' false == true ']'
+ '[' false == true ']'
+ git merge --ff __rultor
Auto-merging pom.xml
Merge made by the 'recursive' strategy.
 .gitignore |  1 +
 README.md  | 51 +++++++++++++++++++++++++++++++++------------------
 pom.xml    | 22 ++++++++++++++++++++--
 3 files changed, 54 insertions(+), 20 deletions(-)
+ docker_when_possible
+ true
++ uptime
++ sed 's/ /\n/g'
++ tail -n 1
+ load=0.05
++ echo 0.05 '>' 30
++ bc
+ '[' 0 -eq 1 ']'
+ echo 'load average is 0.05, low enough to run a new Docker container'
load average is 0.05, low enough to run a new Docker container
+ break
+ cd ..
+ '[' -n '' ']'
+ use_image=maxur/maxur-dev
+ docker pull maxur/maxur-dev
Using default tag: latest
Warning: failed to get default registry endpoint from daemon (Cannot connect to the Docker daemon. Is the docker daemon running on this host?). Using system default: https://index.docker.io/v1/
Cannot connect to the Docker daemon. Is the docker daemon running on this host?
'cid' file is absent, container wasn't started correctly
myunusov commented 8 years ago

@rultor merge

rultor commented 8 years ago

@rultor merge

@myunusov OK, I'll try to merge now. You can check the progress of the merge here

rultor commented 8 years ago

@rultor merge

@myunusov Done! FYI, the full log is here (took me 1min)