aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlban Peignier2018-04-08 19:17:03 +0200
committerAlban Peignier2018-04-08 19:17:03 +0200
commit682ea7b50124763b4c70e3a37bad1e3555698ff4 (patch)
treeb583fb97e1a333d6eb6ea9282b0e6c4d6bd89b8f
parent25473075be6b31632295c95696891368b5bc26f4 (diff)
downloadchouette-core-682ea7b50124763b4c70e3a37bad1e3555698ff4.tar.bz2
Update ci task to avoid problem with CHOUETTE_DEPLOY_DISABLED variable is used. Refs #6047
-rw-r--r--lib/tasks/ci.rake13
1 files changed, 7 insertions, 6 deletions
diff --git a/lib/tasks/ci.rake b/lib/tasks/ci.rake
index 5b2c8ae3c..3822ab267 100644
--- a/lib/tasks/ci.rake
+++ b/lib/tasks/ci.rake
@@ -28,6 +28,7 @@ namespace :ci do
end
def deploy_env
+ return ENV["DEPLOY_ENV"] if ENV["DEPLOY_ENV"]
if git_branch == "master"
"dev"
elsif git_branch.in?(deploy_envs)
@@ -54,12 +55,12 @@ namespace :ci do
desc "Deploy after CI"
task :deploy do
- return if ENV["CHOUETTE_DEPLOY_DISABLED"]
-
- if deploy_env
- sh "cap #{deploy_env} deploy:migrations"
- else
- puts "No deploy for branch #{git_branch}"
+ unless ENV["CHOUETTE_DEPLOY_DISABLED"]
+ if deploy_env
+ sh "cap #{deploy_env} deploy:migrations deploy:seed"
+ else
+ puts "No deploy for branch #{git_branch}"
+ end
end
end