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

[travis] update appraisals #1236

Merged
merged 2 commits into from Jan 11, 2017
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .travis.yml
Expand Up @@ -34,3 +34,4 @@ matrix:
gemfile: gemfiles/rails_5.0.gemfile
allow_failures:
- gemfile: gemfiles/rails_edge.gemfile
- rvm: 2.0.0
8 changes: 5 additions & 3 deletions Appraisals
@@ -1,14 +1,16 @@
appraise 'rails-4.1' do
gem 'rails', '~>4.1.0'
gem 'nokogiri', '~>1.6.8', platform: :mri_20
end

appraise 'rails-4.2' do
gem 'rails', '~>4.2.0.beta4'
gem 'rails', '~>4.2.0'
gem 'nokogiri', '~>1.6.8', platform: :mri_20
end

appraise 'rails-5.0' do
gem 'rails', '> 5.0.0.rc', '< 5.1'
gem 'rspec-rails', '> 3.5.0.beta', '< 3.6'
gem 'rails', '~> 5.0.1'
gem 'rspec-rails', '~> 3.5'
end

appraise 'rails-edge' do
Expand Down
2 changes: 1 addition & 1 deletion formtastic.gemspec
Expand Up @@ -36,7 +36,7 @@ Gem::Specification.new do |s|
s.add_development_dependency(%q<colored>, ["~> 1.2"])
s.add_development_dependency(%q<tzinfo>)
s.add_development_dependency(%q<ammeter>, ["~> 1.1.3"])
s.add_development_dependency(%q<appraisal>, ["~> 1.0"])
s.add_development_dependency(%q<appraisal>, ["~> 2.1"])
s.add_development_dependency(%q<rake>)
s.add_development_dependency(%q<activemodel>, [">= 3.2.13"])
end
1 change: 1 addition & 0 deletions gemfiles/rails_4.1.gemfile
Expand Up @@ -3,5 +3,6 @@
source "https://rubygems.org"

gem "rails", "~>4.1.0"
gem "nokogiri", "~>1.6.8", :platform => :mri_20

gemspec :path => "../"
3 changes: 2 additions & 1 deletion gemfiles/rails_4.2.gemfile
Expand Up @@ -2,6 +2,7 @@

source "https://rubygems.org"

gem "rails", "~>4.2.0.beta4"
gem "rails", "~>4.2.0"
gem "nokogiri", "~>1.6.8", :platform => :mri_20

gemspec :path => "../"
4 changes: 2 additions & 2 deletions gemfiles/rails_5.0.gemfile
Expand Up @@ -2,7 +2,7 @@

source "https://rubygems.org"

gem "rails", "> 5.0.0.rc", "< 5.1"
gem "rspec-rails", "> 3.5.0.beta", "< 3.6"
gem "rails", "~> 5.0.1"
gem "rspec-rails", "~> 3.5"

gemspec :path => "../"
2 changes: 1 addition & 1 deletion gemfiles/rails_edge.gemfile
Expand Up @@ -2,7 +2,7 @@

source "https://rubygems.org"

gem "rails", :git => "git://github.com/rails/rails.git"
gem "rails", :github => "rails/rails"
gem "rack", :github => "rack/rack"
gem "i18n", :github => "svenfuchs/i18n"
gem "arel", :github => "rails/arel"
Expand Down