Skip to content
This repository has been archived by the owner on Jul 11, 2020. It is now read-only.

Commit

Permalink
fix hubot git setup
Browse files Browse the repository at this point in the history
dwradcliffe committed Jan 29, 2015
1 parent e67e3f1 commit d467c33
Showing 3 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Berksfile.lock
Original file line number Diff line number Diff line change
@@ -286,7 +286,7 @@ GRAPH
dns (>= 0.0.0)
hostname (>= 0.0.0)
rubygems-hosts (0.0.10)
rubygems-hubot (0.0.58)
rubygems-hubot (0.0.60)
chef-vault (>= 0.0.0)
hubot (~> 1.0.2)
nginx (>= 0.0.0)
2 changes: 1 addition & 1 deletion cookbooks/rubygems-hubot/metadata.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name 'rubygems-hubot'

version '0.0.58'
version '0.0.60'

depends 'chef-vault'
depends 'hubot', '~> 1.0.2'
3 changes: 2 additions & 1 deletion cookbooks/rubygems-hubot/recipes/deploy.rb
Original file line number Diff line number Diff line change
@@ -13,6 +13,7 @@
git "#{node['rubygems-hubot']['deploy_dir']}/staging" do
repository 'https://github.com/rubygems/rubygems.org.git'
reference 'master'
enable_submodules true
user node['hubot']['user']
group node['hubot']['group']
action :sync
@@ -22,7 +23,7 @@
execute 'setup_git_fetch_for_prs' do
command 'git config --add remote.origin.fetch "+refs/pull/*/head:refs/remotes/origin/pr/*"'
cwd "#{node['rubygems-hubot']['deploy_dir']}/staging"
not_if "cd #{node['rubygems-hubot']['deploy_dir']}/staging && git config --get-all remote.origin.fetch | grep -qs 'origin/pr'"
not_if "cd #{node['rubygems-hubot']['deploy_dir']}/staging && cat .git/config | grep -qs 'refs/remotes/origin/pr'"
end

execute 'bundle_install_deploy' do

0 comments on commit d467c33

Please sign in to comment.