Commit 8739d618 authored by Jonne Haß's avatar Jonne Haß

reenable pg on travis but let it use a basic database.yml

parent f610cdce
......@@ -9,9 +9,9 @@ rvm:
- 1.9.2
env:
# - DB=postgres BUILD_TYPE=other
- DB=postgres BUILD_TYPE=other
- DB=mysql BUILD_TYPE=other
# - DB=postgres BUILD_TYPE=cucumber
- DB=postgres BUILD_TYPE=cucumber
- DB=mysql BUILD_TYPE=cucumber
before_install:
......
......@@ -37,4 +37,7 @@ integration1:
database: diaspora_integration1
integration2:
<<: *common
database: diaspora_integration2
\ No newline at end of file
database: diaspora_integration2
postgres_travis: &postgres_travis
adapter: postgresql
username: postgres
......@@ -23,7 +23,7 @@ sh -e /etc/init.d/xvfb start
echo "Setting up database.yml for $DB"
cp config/database.yml.example config/database.yml
if [ "$DB" = "postgres" ]; then
sed -i 's/*mysql/*postgres/' config/database.yml
sed -i 's/*mysql/*postgres_travis/' config/database.yml
fi
# Set up database
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment