Skip to content

Commit

Permalink
Test against Rails 5.2
Browse files Browse the repository at this point in the history
  • Loading branch information
mshibuya committed Apr 21, 2018
1 parent b313166 commit c0b7fab
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 17 deletions.
38 changes: 23 additions & 15 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,24 @@ language: ruby
cache: bundler

rvm:
- 2.2.9
- 2.3.6
- 2.4.3
- jruby-9.1.15.0
- 2.2.10
- 2.3.7
- 2.4.4
- 2.5.1
- jruby-9.1.15.0

gemfile:
- gemfiles/rails-4-0.gemfile
- gemfiles/rails-4-1.gemfile
- gemfiles/rails-4-2.gemfile
- gemfiles/rails-5-0.gemfile
- gemfiles/rails-5-1.gemfile
- gemfiles/rails-master.gemfile
- gemfiles/rails-5-2.gemfile

sudo: false

before_install:
#- gem update bundler
- gem install bundler

before_script:
- psql -c 'create database carrierwave_test;' -U postgres
Expand All @@ -32,28 +33,35 @@ matrix:
gemfile: gemfiles/rails-4-1.gemfile
- rvm: 2.1.10
gemfile: gemfiles/rails-4-2.gemfile
- rvm: 2.5.1
gemfile: gemfiles/rails-master.gemfile
- rvm: ruby-head
gemfile: gemfiles/rails-5-1.gemfile
gemfile: gemfiles/rails-5-2.gemfile
- rvm: ruby-head
gemfile: gemfiles/rails-master.gemfile
- rvm: jruby-head
gemfile: gemfiles/rails-5-1.gemfile
gemfile: gemfiles/rails-5-0.gemfile
- rvm: jruby-head
gemfile: gemfiles/rails-master.gemfile
gemfile: gemfiles/rails-5-1.gemfile
exclude:
- rvm: 2.4.3
- rvm: 2.4.4
gemfile: gemfiles/rails-4-0.gemfile
- rvm: 2.4.3
- rvm: 2.4.4
gemfile: gemfiles/rails-4-1.gemfile
- rvm: 2.4.3
gemfile: gemfiles/rails-4-2.gemfile
- rvm: 2.5.1
gemfile: gemfiles/rails-4-0.gemfile
- rvm: 2.5.1
gemfile: gemfiles/rails-4-1.gemfile
- rvm: jruby-9.1.15.0
gemfile: gemfiles/rails-5-2.gemfile
allow_failures:
- rvm: ruby-head
- rvm: jruby-head
- rvm: jruby-9.1.15.0
gemfile: gemfiles/rails-5-1.gemfile
gemfile: gemfiles/rails-5-0.gemfile
- rvm: jruby-9.1.15.0
gemfile: gemfiles/rails-master.gemfile
gemfile: gemfiles/rails-5-1.gemfile
- gemfile: gemfiles/rails-master.gemfile
fast_finish: true

notifications:
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails-5-1.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ source "https://rubygems.org"
gem "rails", "~> 5.1.0"
gem "activemodel-serializers-xml"
gem 'pg', '~> 0.21.0', platforms: :ruby
gem "activerecord-jdbcpostgresql-adapter", "~> 51.0", platforms: :jruby
gem "activerecord-jdbcpostgresql-adapter", github: "jruby/activerecord-jdbc-adapter", platforms: :jruby

gemspec :path => "../"
8 changes: 8 additions & 0 deletions gemfiles/rails-5-2.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
source "https://rubygems.org"

gem "rails", "~> 5.2.0"
gem "activemodel-serializers-xml"
gem 'pg', '~> 0.21.0', platforms: :ruby
gem "activerecord-jdbcpostgresql-adapter", github: "jruby/activerecord-jdbc-adapter", platforms: :jruby

gemspec :path => "../"
2 changes: 1 addition & 1 deletion gemfiles/rails-master.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ gem "sprockets", github: "rails/sprockets", branch: "master"
gem "sprockets-rails", github: "rails/sprockets-rails", branch: "master"
gem "sass-rails", github: "rails/sass-rails"
gem "activemodel-serializers-xml"
gem "activerecord-jdbcpostgresql-adapter", "~> 51.0", platforms: :jruby
gem "activerecord-jdbcpostgresql-adapter", github: "jruby/activerecord-jdbc-adapter", platforms: :jruby

gemspec :path => "../"

0 comments on commit c0b7fab

Please sign in to comment.