aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Leighton <j@jonathanleighton.com>2011-12-03 20:09:43 +0000
committerJon Leighton <j@jonathanleighton.com>2011-12-03 20:09:43 +0000
commit3f23c049c2c34e3b3b6233a272fc2206523186a4 (patch)
treeeb3837acd5866d4eb10926266277f9120e071724
parent51c2ef0b819d4732fff59cf1a86336dac38f2280 (diff)
downloadrails-3f23c049c2c34e3b3b6233a272fc2206523186a4.tar.gz
rails-3f23c049c2c34e3b3b6233a272fc2206523186a4.tar.bz2
rails-3f23c049c2c34e3b3b6233a272fc2206523186a4.zip
Enable postgres on the CI :heart: :beer: :sparkles:
-rw-r--r--.travis.yml1
-rw-r--r--Gemfile2
2 files changed, 2 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 265124a3af..9a0ace81bb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,6 +9,7 @@ env:
- "GEM=ar:mysql"
- "GEM=ar:mysql2"
- "GEM=ar:sqlite3"
+ - "GEM=ar:postgresql"
notifications:
email: false
irc:
diff --git a/Gemfile b/Gemfile
index 65950cdc2e..8f228bad4c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -60,7 +60,7 @@ platforms :ruby do
gem "sqlite3", "~> 1.3.4"
group :db do
- gem "pg", ">= 0.11.0" unless ENV['TRAVIS'] # once pg is on travis this can be removed
+ gem "pg", ">= 0.11.0"
gem "mysql", ">= 2.8.1"
gem "mysql2", ">= 0.3.10"
end