diff --git a/.travis.yml b/.travis.yml index db4da039..b2f02182 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,42 +5,18 @@ rvm: - rbx-18mode - rbx-19mode gemfile: - - test/gemfiles/Gemfile.rails-2.0.x - - test/gemfiles/Gemfile.rails-2.1.x - - test/gemfiles/Gemfile.rails-2.2.x - - test/gemfiles/Gemfile.rails-2.3.x - - test/gemfiles/Gemfile.rails-xss-2.3.x - test/gemfiles/Gemfile.rails-3.0.x - test/gemfiles/Gemfile.rails-3.1.x - test/gemfiles/Gemfile.rails-3.2.x matrix: exclude: - - { rvm: 1.9.3, gemfile: test/gemfiles/Gemfile.rails-2.0.x } - - { rvm: 1.9.3, gemfile: test/gemfiles/Gemfile.rails-2.1.x } - - { rvm: 1.9.3, gemfile: test/gemfiles/Gemfile.rails-2.2.x } - # Don't kill Travis: just test against the latest version on JRuby and rbx. - - { rvm: jruby-18mode, gemfile: test/gemfiles/Gemfile.rails-2.0.x } - - { rvm: jruby-18mode, gemfile: test/gemfiles/Gemfile.rails-2.1.x } - - { rvm: jruby-18mode, gemfile: test/gemfiles/Gemfile.rails-2.2.x } - - { rvm: jruby-18mode, gemfile: test/gemfiles/Gemfile.rails-2.3.x } - - { rvm: jruby-18mode, gemfile: test/gemfiles/Gemfile.rails-xss-2.3.x } - { 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-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 } diff --git a/test/gemfiles/Gemfile.rails-2.0.x b/test/gemfiles/Gemfile.rails-2.0.x deleted file mode 100644 index 9d295ab4..00000000 --- a/test/gemfiles/Gemfile.rails-2.0.x +++ /dev/null @@ -1,6 +0,0 @@ -source :rubygems - -gem 'rails', '>= 2.0.0', '< 2.1.0' -gemspec :path => "../.." -gem "haml-contrib", :path => "../../vendor/haml-contrib" - diff --git a/test/gemfiles/Gemfile.rails-2.1.x b/test/gemfiles/Gemfile.rails-2.1.x deleted file mode 100644 index 960462a8..00000000 --- a/test/gemfiles/Gemfile.rails-2.1.x +++ /dev/null @@ -1,8 +0,0 @@ -source :rubygems - -gem 'rails', '>= 2.1.0', '< 2.2.0' -gemspec :path => "../.." -gem "haml-contrib", :path => "../../vendor/haml-contrib" - - - diff --git a/test/gemfiles/Gemfile.rails-2.2.x b/test/gemfiles/Gemfile.rails-2.2.x deleted file mode 100644 index 807a3148..00000000 --- a/test/gemfiles/Gemfile.rails-2.2.x +++ /dev/null @@ -1,7 +0,0 @@ -source :rubygems - -gem 'rails', '>= 2.2.0', '< 2.3.0' -gemspec :path => "../.." -gem "haml-contrib", :path => "../../vendor/haml-contrib" - - diff --git a/test/gemfiles/Gemfile.rails-2.3.x b/test/gemfiles/Gemfile.rails-2.3.x deleted file mode 100644 index 6645e427..00000000 --- a/test/gemfiles/Gemfile.rails-2.3.x +++ /dev/null @@ -1,7 +0,0 @@ -source :rubygems - -gem 'rails', '>= 2.3.0', '< 2.4.0' -gemspec :path => "../.." -gem "haml-contrib", :path => "../../vendor/haml-contrib" - - diff --git a/test/gemfiles/Gemfile.rails-xss-2.3.x b/test/gemfiles/Gemfile.rails-xss-2.3.x deleted file mode 100644 index 378750a2..00000000 --- a/test/gemfiles/Gemfile.rails-xss-2.3.x +++ /dev/null @@ -1,6 +0,0 @@ -source :rubygems - -gem 'rails', '>= 2.3.0', '< 2.4.0' -gem 'rails_xss', '>= 0.1.1' -gemspec :path => "../.." -gem "haml-contrib", :path => "../../vendor/haml-contrib"