Commit 29532e6d authored by Jonne Hass's avatar Jonne Hass

do not specify defaults in .travis.yml but do specify non-defaults. Also restructed it a bit

parent 292b1e74
bundler_args: "--without development production" branches:
only:
- 'master'
rvm: rvm:
- 1.8.7 - 1.8.7
- ree - ree
- 1.9.2 - 1.9.2
before_script: "./config/ci/before-travis.sh"
script: "bundle exec rake travis"
env: env:
- DB=postgres - DB=postgres
- DB=mysql - DB=mysql
branches:
only: bundler_args: "--without development production"
- master before_script: "./config/ci/before-travis.sh"
script: "bundle exec rake travis"
notifications: notifications:
email:
on_success: change
on_failure: all
irc: irc:
on_success: all on_success: all
on_failure: all on_failure: all
channels: channels:
- 'irc.freenode.org#diaspora-dev' - 'irc.freenode.org:6667#diaspora-dev'
- 'irc.freenode.org#diaspora-de' - 'irc.freenode.org:6667#diaspora-de'
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