From 29532e6d90912b699b51e6523870ab737a2e73ec Mon Sep 17 00:00:00 2001
From: Jonne Hass <mrzyx@mrzyx.de>
Date: Wed, 7 Sep 2011 01:21:30 +0200
Subject: [PATCH] do not specify defaults in .travis.yml but do specify
non-defaults. Also restructed it a bit
---
.travis.yml | 24 +++++++++++-------------
1 file changed, 11 insertions(+), 13 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index f314f0f0f6..7e60e3f8ab 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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'
--
GitLab