Permalink
Browse files

do not specify defaults in .travis.yml but do specify non-defaults. A…

…lso restructed it a bit
  • Loading branch information...
1 parent 292b1e7 commit 29532e6d90912b699b51e6523870ab737a2e73ec @jhass jhass committed Sep 6, 2011
Showing with 11 additions and 13 deletions.
  1. +11 −13 .travis.yml
View
@@ -1,29 +1,27 @@
-bundler_args: "--without development production"
+branches:
+ only:
+ - 'master'
+
rvm:
- 1.8.7
- ree
- 1.9.2
-before_script: "./config/ci/before-travis.sh"
-
-script: "bundle exec rake travis"
-
env:
- DB=postgres
- DB=mysql
-branches:
- only:
- - master
+
+bundler_args: "--without development production"
+before_script: "./config/ci/before-travis.sh"
+script: "bundle exec rake travis"
+
notifications:
- email:
- on_success: change
- on_failure: all
irc:
on_success: all
on_failure: all
channels:
- - 'irc.freenode.org#diaspora-dev'
- - 'irc.freenode.org#diaspora-de'
+ - 'irc.freenode.org:6667#diaspora-dev'
+ - 'irc.freenode.org:6667#diaspora-de'

0 comments on commit 29532e6

Please sign in to comment.