From def9ae38c4dd80eb46c563b20a96b58bbf13b78d Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Sat, 19 Dec 2015 22:12:04 -0800 Subject: [PATCH] Set correct git user while deploying on travis --- Rakefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Rakefile b/Rakefile index e9b0c6a3933..bab6092a464 100644 --- a/Rakefile +++ b/Rakefile @@ -260,6 +260,11 @@ multitask :push do puts "\n## Copying #{public_dir} to #{deploy_dir}" cp_r "#{public_dir}/.", deploy_dir cd "#{deploy_dir}" do + if ENV["TRAVIS"] == 'true' + system 'git config user.name "Travis CI"' + system 'git config user.email "balloob+bot@gmail.com"' + end + system "git add -A" message = "Site updated at #{Time.now.utc}" puts "\n## Committing: #{message}" @@ -271,8 +276,6 @@ multitask :push do else puts "## Using GH_TOKEN" new_origin = `git remote -v | grep origin | grep push | awk '{print $2}'`.chomp.sub('//', "//#{ENV['GH_TOKEN']}@") - system 'git config user.name "Travis CI"' - system 'git config user.email "balloob+bot@gmail.com"' system "git remote add origin-auth #{new_origin} > /dev/null 2>&1" system "git push --quiet origin-auth #{deploy_branch} > /dev/null 2>&1" end