summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/tasks/ci.rake1
-rw-r--r--script/deploy-staging.sh1
2 files changed, 0 insertions, 2 deletions
diff --git a/lib/tasks/ci.rake b/lib/tasks/ci.rake
index bc89a01b..78bae684 100644
--- a/lib/tasks/ci.rake
+++ b/lib/tasks/ci.rake
@@ -4,7 +4,6 @@ namespace :ci do
namespace :deploy do
task :staging do
now = Time.now
- sh "git pull"
sh "git tag -a 'staging-#{now.strftime('%Y-%m-%d')}-#{now.to_i}-jenkins-continuous-deployment' -m 'just push it'"
sh "git push --tags"
Rake::Task['deploy:staging'].invoke
diff --git a/script/deploy-staging.sh b/script/deploy-staging.sh
index 222e6b6a..d4ed15e1 100644
--- a/script/deploy-staging.sh
+++ b/script/deploy-staging.sh
@@ -6,5 +6,4 @@ echo 'switch gemset'
rvm use ruby-2.0.0-p195@cakeside --create
echo 'bundle install'
-git checkout master
bundle exec rake ci:deploy:staging --trace