diff --git a/.travis.yml b/.travis.yml index 31297795683dd35ff4aa9762034a2f9069a076e3..0d8eff82a627b5dd66dedaf15271f2b74eb227c9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,11 @@ env: - DB=postgres BUILD_TYPE=cucumber - DB=mysql BUILD_TYPE=cucumber +matrix: + allow_failures: + - env: DB=postgres BUILD_TYPE=cucumber + - env: DB=mysql BUILD_TYPE=cucumber + bundler_args: "--without development production heroku" before_install: "./script/ci/before_install.sh" diff --git a/script/ci/before_install.sh b/script/ci/before_install.sh index d02ec75f1993d308c2134b0ca0c77810b62c3f72..c5236b071b2bb301b2b71fc30a65c00c66eaa32c 100755 --- a/script/ci/before_install.sh +++ b/script/ci/before_install.sh @@ -4,9 +4,3 @@ envdir="$(readlink -e $(dirname $0))/../env" . "$envdir/ruby_env" . "$envdir/ensure_right_rubygems" - -if [ "$BUILD_TYPE" = "cucumber" ]; then - curl http://security.ubuntu.com/ubuntu/pool/main/f/firefox/firefox_16.0.2+build1-0ubuntu0.11.04.1_i386.deb > firefox.deb - sudo apt-get install libnotify4 - sudo dpkg -i firefox.deb -fi