aboutsummaryrefslogtreecommitdiffstats
path: root/lib/tasks
diff options
context:
space:
mode:
authorMarc Florisson2012-06-01 12:20:57 +0200
committerMarc Florisson2012-06-01 12:20:57 +0200
commitee866a45955bac5cef7a8bdec58f86ffcb7cb702 (patch)
treee66d3da0e628034afc362b524b52a1a71977f4ff /lib/tasks
parent7fd20ad1409398e06fb1167332c57b4ac4c9aadc (diff)
parent7082d66ec221aee194d64a17ab5d21eb2955f419 (diff)
downloadchouette-core-ee866a45955bac5cef7a8bdec58f86ffcb7cb702.tar.bz2
Merge branch 'master' of chouette.dryade.priv:/srv/git/chouette2
Diffstat (limited to 'lib/tasks')
-rw-r--r--lib/tasks/ci.rake2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/tasks/ci.rake b/lib/tasks/ci.rake
index 9c541129b..cfd68a1cf 100644
--- a/lib/tasks/ci.rake
+++ b/lib/tasks/ci.rake
@@ -3,7 +3,7 @@ namespace :ci do
cp "config/database.yml.ccontrol", "config/database.yml"
end
task :deploy do
- cp "workspace.war", "/var/lib/tomcat6/webapps/chouette2.war"
+ cp "chouette2.war", "/var/lib/tomcat6/webapps/"
end
task :build => ["db:migrate", "spec", "war", "ci:deploy"]
end