summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.travis.yml10
-rw-r--r--config/database.yml.jenkins7
-rw-r--r--config/database.yml.travis4
3 files changed, 14 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 00000000..1dad5ee3
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,10 @@
+language: ruby
+rvm:
+ - 2.2.0
+cache: bundler
+addons:
+ postgresql: '9.3'
+sudo: false
+before_script:
+ - cp config/database.yml.travis config/database.yml
+ - psql -c 'create database cakeside_test;' -U postgres
diff --git a/config/database.yml.jenkins b/config/database.yml.jenkins
deleted file mode 100644
index bd56d795..00000000
--- a/config/database.yml.jenkins
+++ /dev/null
@@ -1,7 +0,0 @@
-test:
- adapter: postgresql
- encoding: unicode
- database: cakeside_test
- pool: 5
- username: jenkins
- password:
diff --git a/config/database.yml.travis b/config/database.yml.travis
new file mode 100644
index 00000000..d338a8f5
--- /dev/null
+++ b/config/database.yml.travis
@@ -0,0 +1,4 @@
+test:
+ adapter: postgresql
+ database: cakeside_test
+ username: postgres