Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Adjust gemspec and test/ci for Rails 5 #144

Merged
merged 3 commits into from
Jul 7, 2016
Merged

Adjust gemspec and test/ci for Rails 5 #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c37266c
More liberal active record dependency that supports rails 5
jnunemaker Jul 7, 2016
b687c55
Add rails 5 to test matrix
jnunemaker Jul 7, 2016
067d3fe
Update travis to use rails 5
jnunemaker Jul 7, 2016
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
6 changes: 3 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ services:
- mongodb
- memcached
env:
- RAILS_VERSION=5.0.0.beta3
- RAILS_VERSION=5.0.0
- RAILS_VERSION=4.2.5
- RAILS_VERSION=3.2.21
matrix:
# don't run rails 5 on ruby versions that can't install rack 2
exclude:
- rvm: 2.0.0
env: RAILS_VERSION=5.0.0.beta3
env: RAILS_VERSION=5.0.0
- rvm: 2.1.8
env: RAILS_VERSION=5.0.0.beta3
env: RAILS_VERSION=5.0.0
2 changes: 1 addition & 1 deletion flipper-active_record.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ Gem::Specification.new do |gem|
gem.version = Flipper::VERSION

gem.add_dependency 'flipper', "~> #{Flipper::VERSION}"
gem.add_dependency 'activerecord', ">= 3.2", "< 5"
gem.add_dependency 'activerecord', ">= 3.2", "< 6"
end
2 changes: 1 addition & 1 deletion script/test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ export RAILS_VERSION=4.2.5
script/bootstrap || bundle update
bundle exec rake

export RAILS_VERSION=5.0.0.rc1
export RAILS_VERSION=5.0.0
script/bootstrap || bundle update
bundle exec rake