From 682ea7b50124763b4c70e3a37bad1e3555698ff4 Mon Sep 17 00:00:00 2001
From: Alban Peignier
Date: Sun, 8 Apr 2018 19:17:03 +0200
Subject: Update ci task to avoid problem with CHOUETTE_DEPLOY_DISABLED
 variable is used.  Refs #6047

---
 lib/tasks/ci.rake | 13 +++++++------
 1 file 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
 
-- 
cgit v1.2.3