Skip to content

Commit

Permalink
Fix the ar3 build on 4.1-stable branch (#820)
Browse files Browse the repository at this point in the history
Fixes the travis build of the AR 3 gemfile, which was failing to resolve dependencies under ruby 1.8.7. The changes are:

activerecord = 3.2.22.2 (was ~> 3.2)
i18n < 0.7 (was ~> 0.6.11)
railties > 0 (was ~> 3.0)
sinatra ~> 1.1.4 (was ~> 1.0)
rspec-rails ~> 3.4.2 (was ~> 3.1.0)

These changes are only applicable to PT 4, as PT 5 dropped support for ruby 1.8.7 and also uses the appraisal gem now to manage its various AR gemfiles.
  • Loading branch information
jaredbeck committed May 31, 2016
1 parent d0b7cf2 commit 29786c3
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 9 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ pkg/*
.bundle
.rbenv-version
Gemfile.lock
gemfiles/*.lock
vendor/*
.idea
.rvmrc
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ before_script:

gemfile:
- Gemfile
- gemfiles/3.0.gemfile
- gemfiles/ar3.gemfile

matrix:
fast_finish: true
Expand Down
14 changes: 6 additions & 8 deletions gemfiles/3.0.gemfile → gemfiles/ar3.gemfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
source 'https://rubygems.org'

gem 'activerecord', '~> 3.2'
gem 'i18n', '~> 0.6.11'
gem 'activerecord', '3.2.22.2'
gem 'request_store', '~> 1.1.0'

# i18n 0.7 requires ruby >= 1.9.3, but we still support 1.8.7
gem 'i18n', '< 0.7'

# actionpack 3 depends on rack-cache ~> 1.2, but bundler seems to ignore that.
# Also rack-cache 1.3 dropped support for ruby 1.8.7. The simplest thing for now
# was to specify rack-cache ~> 1.2 here, though it should be unnecessary given
Expand All @@ -15,15 +17,11 @@ group :development, :test do
gem 'shoulda', '~> 3.5'
gem 'ffaker', '<= 1.31.0'

# Testing of Rails
gem 'railties', '~> 3.0'

# Testing of Sinatra
gem 'sinatra', '~> 1.0'
gem 'rack-test', '>= 0.6'
gem 'sinatra', '~> 1.1.4'

# RSpec testing
gem 'rspec-rails', '~> 3.1.0'
gem 'rspec-rails', '~> 3.4.2'
gem 'generator_spec'

# To do proper transactional testing with ActiveSupport::TestCase on MySQL
Expand Down

0 comments on commit 29786c3

Please sign in to comment.