Skip to content

Commit

Permalink
Try to simplify TravisCI exclude matrix, add Rails 5 and Ruby 2.3 tes…
Browse files Browse the repository at this point in the history
…t (refs #105)
  • Loading branch information
JonathanTron committed Jan 15, 2016
1 parent dde8fad commit 579f7de
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 39 deletions.
48 changes: 10 additions & 38 deletions .travis.yml
Expand Up @@ -8,6 +8,7 @@ rvm:
- 2.0.0
- 2.1
- 2.2
- 2.3
- jruby-18mode
- jruby-19mode
env:
Expand All @@ -18,68 +19,39 @@ gemfile:
- ci/rails-4.0.gemfile
- ci/rails-4.1.gemfile
- ci/rails-4.2.gemfile
- ci/rails-5.0.gemfile
matrix:
allow_failures:
- gemfile: ci/rails-5.0.gemfile
exclude:
- rvm: 2.2
gemfile: ci/rails-3.2.gemfile
env: SEQUEL='~> 3.0'
- rvm: 2.2
- rvm: 2.3
gemfile: ci/rails-3.2.gemfile
env: SEQUEL='~> 4.0'
- rvm: ree
gemfile: ci/rails-4.0.gemfile
env: SEQUEL='~> 3.0'
- rvm: ree
gemfile: ci/rails-4.0.gemfile
env: SEQUEL='~> 4.0'
- rvm: 1.8.7
gemfile: ci/rails-4.0.gemfile
env: SEQUEL='~> 3.0'
- rvm: 1.8.7
gemfile: ci/rails-4.0.gemfile
env: SEQUEL='~> 4.0'
- rvm: jruby-18mode
gemfile: ci/rails-4.0.gemfile
env: SEQUEL='~> 3.0'
- rvm: jruby-18mode
gemfile: ci/rails-4.0.gemfile
env: SEQUEL='~> 4.0'
- rvm: ree
gemfile: ci/rails-4.1.gemfile
env: SEQUEL='~> 3.0'
- rvm: ree
gemfile: ci/rails-4.1.gemfile
env: SEQUEL='~> 4.0'
- rvm: 1.8.7
gemfile: ci/rails-4.1.gemfile
env: SEQUEL='~> 3.0'
- rvm: 1.8.7
gemfile: ci/rails-4.1.gemfile
env: SEQUEL='~> 4.0'
- rvm: jruby-18mode
gemfile: ci/rails-4.1.gemfile
env: SEQUEL='~> 3.0'
- rvm: jruby-18mode
gemfile: ci/rails-4.1.gemfile
env: SEQUEL='~> 4.0'
- rvm: ree
gemfile: ci/rails-4.2.gemfile
env: SEQUEL='~> 3.0'
- rvm: ree
gemfile: ci/rails-4.2.gemfile
env: SEQUEL='~> 4.0'
- rvm: 1.8.7
gemfile: ci/rails-4.2.gemfile
env: SEQUEL='~> 3.0'
- rvm: 1.8.7
gemfile: ci/rails-4.2.gemfile
env: SEQUEL='~> 4.0'
- rvm: jruby-18mode
gemfile: ci/rails-4.2.gemfile
env: SEQUEL='~> 3.0'
- rvm: ree
gemfile: ci/rails-5.0.gemfile
- rvm: 1.8.7
gemfile: ci/rails-5.0.gemfile
- rvm: jruby-18mode
gemfile: ci/rails-4.2.gemfile
env: SEQUEL='~> 4.0'
gemfile: ci/rails-5.0.gemfile
notifications:
email:
- jonathan.tron@metrilio.com
25 changes: 25 additions & 0 deletions ci/rails-5.0.gemfile
@@ -0,0 +1,25 @@
source 'https://rubygems.org'

gem 'railties', '~> 5.0.0.beta1'
gem 'activemodel', '~> 5.0.0.beta1'

gemspec :path => '../'

gem 'sequel', "#{ENV['SEQUEL']}"

gem 'fakefs', '0.5.3', :require => 'fakefs/safe'

# MRI/Rubinius Adapter Dependencies
platform :ruby do
gem 'pg'
gem 'mysql'
gem 'mysql2'
gem 'sqlite3'
end

# JRuby Adapter Dependencies
platform :jruby do
gem 'jdbc-sqlite3'
gem 'jdbc-mysql'
gem 'jdbc-postgres'
end
2 changes: 1 addition & 1 deletion sequel-rails.gemspec
Expand Up @@ -43,6 +43,6 @@ Gem::Specification.new do |s|
s.add_development_dependency 'rspec', '~> 3.1'
s.add_development_dependency 'rspec-rails', '~> 3.1', '< 3.3'
s.add_development_dependency 'rubocop', '~> 0.33.0' unless RUBY_VERSION < '1.9.2'
s.add_development_dependency 'ammeter', '1.1.2'
s.add_development_dependency 'ammeter', '1.1.3'
s.add_development_dependency 'test-unit' if RUBY_VERSION >= '2.2.0'
end

0 comments on commit 579f7de

Please sign in to comment.