Moves ci directory in test directory and removes Ruby 1.8.7 from test

ekylibre · Sep 19, 2012 · 40a4eb3 · 40a4eb3
1 parent db2a8f6
commit 40a4eb3
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,12 +1,11 @@
 rvm:
-  - 1.8.7
   - 1.9.2
   - 1.9.3
 env:
   - DB=mysql
   - DB=postgresql
   - DB=sqlite3
 before_script: 
-  - "ci/setup"
+  - "test/ci/setup"
   - "bundle exec rake db:migrate" #  > migrate.log
 script: "bundle exec rake test"
diff --git a/ci/database.mysql.yml → test/ci/database.mysql.yml b/ci/database.mysql.yml → test/ci/database.mysql.yml
diff --git a/ci/database.postgresql.yml → test/ci/database.postgresql.yml b/ci/database.postgresql.yml → test/ci/database.postgresql.yml
diff --git a/ci/database.sqlite3.yml → test/ci/database.sqlite3.yml b/ci/database.sqlite3.yml → test/ci/database.sqlite3.yml
diff --git a/ci/setup → test/ci/setup b/ci/setup → test/ci/setup
@@ -12,7 +12,7 @@ else
 end
 
 # Copy database.yml like in real case
-system("cp -f #{here}/database.#{database}.yml #{here}/../config/database.yml")
+system("cp -f #{here}/database.#{database}.yml #{here}/../../config/database.yml")
 
 # Create Database manually
 if database == :postgresql