From a8cc8f05e398c3e8fe009abe3b58f20fa965cb7a Mon Sep 17 00:00:00 2001 From: zaca Date: Tue, 1 Nov 2016 09:20:01 -0300 Subject: [PATCH] Refs #3 - Move branchs configuration to correct place --- lib/tasks/integrate.rake | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/tasks/integrate.rake b/lib/tasks/integrate.rake index 6152888..09b2e0e 100644 --- a/lib/tasks/integrate.rake +++ b/lib/tasks/integrate.rake @@ -50,9 +50,6 @@ task promote_staging_to_production: [ ] namespace :integration do - BRANCH_DEVELOPMENT = ENV['INTEGRATE_BRANCH_DEVELOPMENT'] || 'master' - BRANCH_STAGING = ENV['INTEGRATE_BRANCH_STAGING'] || 'staging' - BRANCH_PRODUCTION = ENV['INTEGRATE_BRANCH_PRODUCTION'] || 'production' task :set_production_as_deploy_env do ENV['APP_ENV'] ||= 'production' @@ -70,6 +67,10 @@ namespace :integration do USER = `whoami`.chomp APP_ENV = ENV['APP_ENV'] || 'staging' APP = "#{PROJECT}-#{APP_ENV}" + + BRANCH_DEVELOPMENT = ENV['INTEGRATE_BRANCH_DEVELOPMENT'] || 'master' + BRANCH_STAGING = ENV['INTEGRATE_BRANCH_STAGING'] || 'staging' + BRANCH_PRODUCTION = ENV['INTEGRATE_BRANCH_PRODUCTION'] || 'production' end task test: 'integration:test:prepare' do