Merge branch 'master' of github.com:internetee/registry

This commit is contained in:
Martin Lensment 2014-10-06 17:03:35 +03:00
commit b351c97647

View file

@ -11,6 +11,11 @@ git pull origin master
git reset --hard
unset GIT_DIR GIT_WORK_TREE
# run rubocop
echo "RUBOCOP_RESULTS"
rubocop
echo "END_OF_RUBOCOP_RESULTS"
bundle install --deployment
# cp config/secrets-example.yml config/secrets.yml
@ -26,11 +31,6 @@ echo "GIT_LAST_COMMITS"
git log origin/master -n 15 --pretty=oneline | sed -r '/^.{40} Merge branch/d' | sed -r 's/^.{40}/Latests: /'
echo "END_OF_GIT_LAST_COMMITS"
# run rubocop
echo "RUBOCOP_RESULTS"
rubocop
echo "END_OF_RUBOCOP_RESULTS"
# run tests
echo "TEST_RESULTS"
RAILS_ENV=test ROBOT=true bundle exec rake test