Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rails 6.0.0.beta1 support #937

Merged
merged 5 commits into from
Feb 3, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
language: ruby
cache: bundler

addons:
postgresql: '9.4'

rvm:
- ruby-head
- 2.5.1
Expand All @@ -17,17 +20,26 @@ gemfile:
- gemfiles/activerecord_5.2.gemfile
- gemfiles/activerecord_5.1.gemfile
- gemfiles/activerecord_5.0.gemfile
- gemfiles/activerecord_6.0.gemfile

sudo: false

bundler_args: '--without local_development --jobs 3 --retry 3'

before_install:
- gem install bundler
- gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
- gem install bundler -v '< 2'

script: bundle exec rake

matrix:
allow_failures:
- rvm: ruby-head
fast_finish: true
exclude:
- rvm: 2.2.7
gemfile: gemfiles/activerecord_6.0.gemfile
- rvm: 2.3.7
gemfile: gemfiles/activerecord_6.0.gemfile
- rvm: 2.4.4
gemfile: gemfiles/activerecord_6.0.gemfile
4 changes: 4 additions & 0 deletions Appraisals
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,7 @@ end
appraise 'activerecord-5.0' do
gem 'activerecord', "~> 5.0.3"
end

appraise 'activerecord-6.0' do
gem 'activerecord', "~> 6.0.0.beta1"
end
2 changes: 1 addition & 1 deletion acts-as-taggable-on.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Gem::Specification.new do |gem|
gem.post_install_message = File.read('UPGRADING.md')
end

gem.add_runtime_dependency 'activerecord', ['~> 5.0']
gem.add_runtime_dependency 'activerecord', '>= 5.0', '< 6.1'

gem.add_development_dependency 'rspec-rails'
gem.add_development_dependency 'rspec-its'
Expand Down
23 changes: 23 additions & 0 deletions gemfiles/activerecord_6.0.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "activerecord", "~> 6.0.0.beta1"
case ENV["DB"]
when "postgresql"
gem 'pg'
when "mysql"
gem 'mysql2', '~> 0.3'
else
gem 'sqlite3'
end

group :local_development do
gem "guard"
gem "guard-rspec"
gem "appraisal"
gem "rake"
gem "byebug", platforms: [:mri_21, :mri_22, :mri_23]
end

gemspec path: "../"