Download as
Browse Code »

Commit db02c9b8271afd628b42141594cddd96d433bcc4

Authored by Daniel Beardsley
1 parent 98963feb
Exists in master and in 1 other branch production

Capistrano: deploy from fixed branch 

Not the 'current' branch in the local clone fo the repo.

I feel like deploying from the current branch in the local clone is a
bit presumptous. I expect most people want to deploy from one branch
while allowing for development of several feature branches.

Right now you always have to remember to check out master before
deploying or you may deploy your feature branch (which may not even be
pushed).
Showing 2 changed files with 2 additions and 2 deletions   Show diff stats
config/config.example.yml
  Diff comments   View file @db02c9b
@@ -57,6 +57,7 @@ deployment: @@ -57,6 +57,7 @@ deployment:
57 app: errbit.example.com 57 app: errbit.example.com
58 db: errbit.example.com 58 db: errbit.example.com
59 repository: http://github.com/errbit/errbit.git 59 repository: http://github.com/errbit/errbit.git
  60 + branch: master
60 user: deploy 61 user: deploy
61 deploy_to: /var/www/apps/errbit 62 deploy_to: /var/www/apps/errbit
62 # setup path to unicorn pids folder (or deploy_to/shared/pids will be used) 63 # setup path to unicorn pids folder (or deploy_to/shared/pids will be used)
config/deploy.example.rb
  Diff comments   View file @db02c9b
@@ -35,8 +35,7 @@ set :copy_compression, :bz2 @@ -35,8 +35,7 @@ set :copy_compression, :bz2
35 35
36 set :scm, :git 36 set :scm, :git
37 set :scm_verbose, true 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 before 'deploy:assets:symlink', 'errbit:symlink_configs' 40 before 'deploy:assets:symlink', 'errbit:symlink_configs'
42 # if unicorn is started through something like runit (the tool which restarts the process when it's stopped) 41 # if unicorn is started through something like runit (the tool which restarts the process when it's stopped)