do not specify defaults in .travis.yml but do specify non-defaults. Also restructed it a bit
This commit is contained in:
parent
292b1e7465
commit
29532e6d90
1 changed files with 11 additions and 13 deletions
24
.travis.yml
24
.travis.yml
|
|
@ -1,29 +1,27 @@
|
||||||
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'
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue