From a0eda7c229a413bec1a06aa15132ee8ad7284966 Mon Sep 17 00:00:00 2001 From: Jo Liss Date: Fri, 4 May 2012 13:24:37 +0200 Subject: [PATCH] Re-add rbx-18mode and rbx-19mode, but ignore failures --- .travis.yml | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index f8f8fdb4..db4da039 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,8 @@ rvm: - 1.8.7 - 1.9.3 - jruby-18mode - # - rbx-18mode + - rbx-18mode + - rbx-19mode gemfile: - test/gemfiles/Gemfile.rails-2.0.x - test/gemfiles/Gemfile.rails-2.1.x @@ -27,13 +28,26 @@ matrix: - { rvm: jruby-18mode, gemfile: test/gemfiles/Gemfile.rails-3.0.x } - { rvm: jruby-18mode, gemfile: test/gemfiles/Gemfile.rails-3.1.x } - # - { rvm: rbx-18mode, gemfile: test/gemfiles/Gemfile.rails-2.0.x } - # - { rvm: rbx-18mode, gemfile: test/gemfiles/Gemfile.rails-2.1.x } - # - { rvm: rbx-18mode, gemfile: test/gemfiles/Gemfile.rails-2.2.x } - # - { rvm: rbx-18mode, gemfile: test/gemfiles/Gemfile.rails-2.3.x } - # - { rvm: rbx-18mode, gemfile: test/gemfiles/Gemfile.rails-xss-2.3.x } - # - { rvm: rbx-18mode, gemfile: test/gemfiles/Gemfile.rails-3.0.x } - # - { rvm: rbx-18mode, gemfile: test/gemfiles/Gemfile.rails-3.1.x } + - { rvm: rbx-18mode, gemfile: test/gemfiles/Gemfile.rails-2.0.x } + - { rvm: rbx-18mode, gemfile: test/gemfiles/Gemfile.rails-2.1.x } + - { rvm: rbx-18mode, gemfile: test/gemfiles/Gemfile.rails-2.2.x } + - { rvm: rbx-18mode, gemfile: test/gemfiles/Gemfile.rails-2.3.x } + - { rvm: rbx-18mode, gemfile: test/gemfiles/Gemfile.rails-xss-2.3.x } + - { rvm: rbx-18mode, gemfile: test/gemfiles/Gemfile.rails-3.0.x } + - { rvm: rbx-18mode, gemfile: test/gemfiles/Gemfile.rails-3.1.x } + + - { rvm: rbx-19mode, gemfile: test/gemfiles/Gemfile.rails-2.0.x } + - { rvm: rbx-19mode, gemfile: test/gemfiles/Gemfile.rails-2.1.x } + - { rvm: rbx-19mode, gemfile: test/gemfiles/Gemfile.rails-2.2.x } + - { rvm: rbx-19mode, gemfile: test/gemfiles/Gemfile.rails-2.3.x } + - { rvm: rbx-19mode, gemfile: test/gemfiles/Gemfile.rails-xss-2.3.x } + - { rvm: rbx-19mode, gemfile: test/gemfiles/Gemfile.rails-3.0.x } + - { rvm: rbx-19mode, gemfile: test/gemfiles/Gemfile.rails-3.1.x } + + allow_failures: + - { rvm: rbx-18mode, gemfile: test/gemfiles/Gemfile.rails-3.2.x } + - { rvm: rbx-19mode, gemfile: test/gemfiles/Gemfile.rails-3.2.x } + branches: only: - master