Merge pull request #443 from iFixit/deploy-fixed-branch

Capistrano: deploy from fixed branch

Merge pull request #443 from iFixit/deploy-fixed-branch
Capistrano: deploy from fixed branch
Nathan Broadbent
2 parents 2eb1fea2 db02c9b8
Showing 2 changed files with 2 additions and 2 deletions Show diff stats
config/config.example.yml
config/deploy.example.rb
@@ -66,6 +66,7 @@ deployment:
     app: errbit.example.com
     db: errbit.example.com
   repository: http://github.com/errbit/errbit.git
+  branch: master
   user: deploy
   deploy_to: /var/www/apps/errbit
   # setup path to unicorn pids folder (or deploy_to/shared/pids will be used)
@@ -35,8 +35,7 @@ set :copy_compression, :bz2
  
 set :scm, :git
 set :scm_verbose, true
-set(:current_branch) { `git branch`.match(/\* (\S+)\s/m)[1] || raise("Couldn't determine current branch") }
-set :branch, defer { current_branch }
+set :branch, config['branch'] || 'master'
  
 before 'deploy:assets:symlink', 'errbit:symlink_configs'
 # if unicorn is started through something like runit (the tool which restarts the process when it's stopped)
...	...	@@ -66,6 +66,7 @@ deployment:
66	66	app: errbit.example.com
67	67	db: errbit.example.com
68	68	repository: http://github.com/errbit/errbit.git
	69	+ branch: master
69	70	user: deploy
70	71	deploy_to: /var/www/apps/errbit
71	72	# setup path to unicorn pids folder (or deploy_to/shared/pids will be used)
...	...
...	...	@@ -35,8 +35,7 @@ set :copy_compression, :bz2
35	35
36	36	set :scm, :git
37	37	set :scm_verbose, true
38		-set(:current_branch) { `git branch`.match(/\* (\S+)\s/m)[1] \|\| raise("Couldn't determine current branch") }
39		-set :branch, defer { current_branch }
	38	+set :branch, config['branch'] \|\| 'master'
40	39
41	40	before 'deploy:assets:symlink', 'errbit:symlink_configs'
42	41	# if unicorn is started through something like runit (the tool which restarts the process when it's stopped)
...	...