Set correct git user while deploying on travis

This commit is contained in:
Paulus Schoutsen 2015-12-19 22:12:04 -08:00
parent 7519b4f0e0
commit def9ae38c4

View File

@ -260,6 +260,11 @@ multitask :push do
puts "\n## Copying #{public_dir} to #{deploy_dir}" puts "\n## Copying #{public_dir} to #{deploy_dir}"
cp_r "#{public_dir}/.", deploy_dir cp_r "#{public_dir}/.", deploy_dir
cd "#{deploy_dir}" do 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" system "git add -A"
message = "Site updated at #{Time.now.utc}" message = "Site updated at #{Time.now.utc}"
puts "\n## Committing: #{message}" puts "\n## Committing: #{message}"
@ -271,8 +276,6 @@ multitask :push do
else else
puts "## Using GH_TOKEN" puts "## Using GH_TOKEN"
new_origin = `git remote -v | grep origin | grep push | awk '{print $2}'`.chomp.sub('//', "//#{ENV['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 remote add origin-auth #{new_origin} > /dev/null 2>&1"
system "git push --quiet origin-auth #{deploy_branch} > /dev/null 2>&1" system "git push --quiet origin-auth #{deploy_branch} > /dev/null 2>&1"
end end