From 8fb62a3b3596e6fee730ae36cd14d393bdd7e753 Mon Sep 17 00:00:00 2001 From: kikito Date: Wed, 9 Sep 2015 12:37:33 +0200 Subject: [PATCH 1/4] asks for the branch to deploy instead of immediately deploying master in staging & pre --- config/deploy/preproduction.rb | 2 +- config/deploy/staging.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/deploy/preproduction.rb b/config/deploy/preproduction.rb index 97759d6ce..70670881a 100644 --- a/config/deploy/preproduction.rb +++ b/config/deploy/preproduction.rb @@ -1,7 +1,7 @@ set :deploy_to, deploysecret(:deploy_to) set :server_name, deploysecret(:server_name) set :db_server, deploysecret(:db_server) -set :branch, :master +ask :branch, :master set :ssh_options, port: deploysecret(:ssh_port) set :stage, :preproduction set :rails_env, :preproduction diff --git a/config/deploy/staging.rb b/config/deploy/staging.rb index 09ba7401a..0503d8ce5 100644 --- a/config/deploy/staging.rb +++ b/config/deploy/staging.rb @@ -1,7 +1,7 @@ set :deploy_to, deploysecret(:deploy_to) set :server_name, deploysecret(:server_name) set :db_server, deploysecret(:db_server) -set :branch, :master +ask :branch, :master set :ssh_options, port: deploysecret(:ssh_port) set :stage, :staging set :rails_env, :staging From 2f983198d7503fe58f1544cfb2ec868eff0db666 Mon Sep 17 00:00:00 2001 From: kikito Date: Wed, 9 Sep 2015 12:45:09 +0200 Subject: [PATCH 2/4] default to custom branch in staging and pre --- config/deploy/preproduction.rb | 2 +- config/deploy/staging.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/deploy/preproduction.rb b/config/deploy/preproduction.rb index 70670881a..9af3f5a3b 100644 --- a/config/deploy/preproduction.rb +++ b/config/deploy/preproduction.rb @@ -1,7 +1,7 @@ set :deploy_to, deploysecret(:deploy_to) set :server_name, deploysecret(:server_name) set :db_server, deploysecret(:db_server) -ask :branch, :master +ask :branch, `git rev-parse --abbrev-ref HEAD`.chomp set :ssh_options, port: deploysecret(:ssh_port) set :stage, :preproduction set :rails_env, :preproduction diff --git a/config/deploy/staging.rb b/config/deploy/staging.rb index 0503d8ce5..d2b46723a 100644 --- a/config/deploy/staging.rb +++ b/config/deploy/staging.rb @@ -1,7 +1,7 @@ set :deploy_to, deploysecret(:deploy_to) set :server_name, deploysecret(:server_name) set :db_server, deploysecret(:db_server) -ask :branch, :master +ask :branch, `git rev-parse --abbrev-ref HEAD`.chomp set :ssh_options, port: deploysecret(:ssh_port) set :stage, :staging set :rails_env, :staging From e7e1663b26184113748619e382d6b7c453ac608d Mon Sep 17 00:00:00 2001 From: kikito Date: Wed, 9 Sep 2015 19:46:26 +0200 Subject: [PATCH 3/4] makes staging the only variable server. uses ENV and defaults to master --- config/deploy/preproduction.rb | 2 +- config/deploy/staging.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/deploy/preproduction.rb b/config/deploy/preproduction.rb index 9af3f5a3b..21e7d9468 100644 --- a/config/deploy/preproduction.rb +++ b/config/deploy/preproduction.rb @@ -1,7 +1,7 @@ set :deploy_to, deploysecret(:deploy_to) set :server_name, deploysecret(:server_name) set :db_server, deploysecret(:db_server) -ask :branch, `git rev-parse --abbrev-ref HEAD`.chomp +set :branch, 'master' set :ssh_options, port: deploysecret(:ssh_port) set :stage, :preproduction set :rails_env, :preproduction diff --git a/config/deploy/staging.rb b/config/deploy/staging.rb index d2b46723a..4a68738de 100644 --- a/config/deploy/staging.rb +++ b/config/deploy/staging.rb @@ -1,7 +1,7 @@ set :deploy_to, deploysecret(:deploy_to) set :server_name, deploysecret(:server_name) set :db_server, deploysecret(:db_server) -ask :branch, `git rev-parse --abbrev-ref HEAD`.chomp +set :branch, ENV['branch'] || 'master' set :ssh_options, port: deploysecret(:ssh_port) set :stage, :staging set :rails_env, :staging From f8d6dd4ca7cac1d6fd464759d39ca326019d5456 Mon Sep 17 00:00:00 2001 From: kikito Date: Wed, 9 Sep 2015 19:49:09 +0200 Subject: [PATCH 4/4] strings to symbols --- config/deploy/preproduction.rb | 2 +- config/deploy/staging.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/deploy/preproduction.rb b/config/deploy/preproduction.rb index 21e7d9468..97759d6ce 100644 --- a/config/deploy/preproduction.rb +++ b/config/deploy/preproduction.rb @@ -1,7 +1,7 @@ set :deploy_to, deploysecret(:deploy_to) set :server_name, deploysecret(:server_name) set :db_server, deploysecret(:db_server) -set :branch, 'master' +set :branch, :master set :ssh_options, port: deploysecret(:ssh_port) set :stage, :preproduction set :rails_env, :preproduction diff --git a/config/deploy/staging.rb b/config/deploy/staging.rb index 4a68738de..0822fb9a1 100644 --- a/config/deploy/staging.rb +++ b/config/deploy/staging.rb @@ -1,7 +1,7 @@ set :deploy_to, deploysecret(:deploy_to) set :server_name, deploysecret(:server_name) set :db_server, deploysecret(:db_server) -set :branch, ENV['branch'] || 'master' +set :branch, ENV['branch'] || :master set :ssh_options, port: deploysecret(:ssh_port) set :stage, :staging set :rails_env, :staging