From a75950b06ee61bf7e159debb973768f0b18bdd95 Mon Sep 17 00:00:00 2001
From: Luc Donnet
Date: Fri, 30 Jan 2015 15:06:29 +0100
Subject: Fix and update travis config

---
 lib/tasks/ci.rake | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'lib/tasks')

diff --git a/lib/tasks/ci.rake b/lib/tasks/ci.rake
index 8a59f54b9..092a4619f 100644
--- a/lib/tasks/ci.rake
+++ b/lib/tasks/ci.rake
@@ -2,14 +2,10 @@ namespace :ci do
   task :db_travis_config do
     cp "config/database.yml.travis", "config/database.yml"
   end
-  task :prepare_travis => ["ci:db_travis_config", "apartment:migrate"]
-  task :db_config do
-    cp "config/database.yml.ccontrol", "config/database.yml"
-  end
-  task :prepare => ["ci:db_config", "db:migrate"]
+  
   task :deploy do
     cp "chouette2.war", "/var/lib/tomcat6/webapps/"
-  end
+  end  
   task :build => [ "war", "ci:deploy"]
 end
 
-- 
cgit v1.2.3