Skip to content

Commit

Permalink
ci: pin concurrent-ruby version for older rails versions (#1176)
Browse files Browse the repository at this point in the history
  • Loading branch information
waltjones authored Feb 7, 2025
1 parent 1e9aa28 commit 9c916bb
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 1 deletion.
4 changes: 4 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ else
gem 'rspec-rails', '~> 6.0.3'
end

if GEMFILE_RAILS_VERSION < '7.1'
gem 'concurrent-ruby', '1.3.4'
end

if GEMFILE_RAILS_VERSION < '6.0'
gem 'sqlite3', '< 1.4.0', :platform => [:ruby, :mswin, :mingw]
else
Expand Down
4 changes: 3 additions & 1 deletion gemfiles/rails50.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,15 @@ gem 'sucker_punch', '~> 2.0'

gem 'rack', '2.1.2' if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3')

# We need last sinatra that uses rack 2.1.x
gem 'concurrent-ruby', '1.3.4'
gem 'database_cleaner', '~> 1.8.4'
gem 'delayed_job', :require => false
gem 'generator_spec'
gem 'redis', '<= 3.3.5'
gem 'resque'
gem 'secure_headers', '~> 6.3.2', :require => false

# We need last sinatra that uses rack 2.1.x
gem 'sinatra', :git => 'https://github.com/sinatra/sinatra', :tag => 'v2.0.8'

unless is_jruby
Expand Down
1 change: 1 addition & 0 deletions gemfiles/rails51.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ gem 'rack', '2.1.2' if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3')
# We need last sinatra that uses rack 2.1.x
gem 'sinatra', :git => 'https://github.com/sinatra/sinatra', :tag => 'v2.0.8'

gem 'concurrent-ruby', '1.3.4'
gem 'database_cleaner', '~> 1.8.4'
gem 'delayed_job', :require => false
gem 'generator_spec'
Expand Down
1 change: 1 addition & 0 deletions gemfiles/rails52.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ gem 'sucker_punch', '~> 2.0'
# We need last sinatra that uses rack 2.x and ruby 2.5.x
gem 'sinatra', :git => 'https://github.com/sinatra/sinatra', :tag =>'v2.1.0'

gem 'concurrent-ruby', '1.3.4'
gem 'database_cleaner'
gem 'delayed_job', :require => false
gem 'generator_spec'
Expand Down
1 change: 1 addition & 0 deletions gemfiles/rails60.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ gem 'sucker_punch', '~> 2.0'
# We need last sinatra that uses rack 2.x and ruby 2.5.x
gem 'sinatra', :git => 'https://github.com/sinatra/sinatra', :tag =>'v2.1.0'

gem 'concurrent-ruby', '1.3.4'
gem 'database_cleaner'
gem 'delayed_job', '4.1.9', :require => false
gem 'generator_spec'
Expand Down
1 change: 1 addition & 0 deletions gemfiles/rails61.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ gem 'sucker_punch', '~> 2.0'
# We need last sinatra that uses rack 2.x and ruby 2.5.x
gem 'sinatra', :git => 'https://github.com/sinatra/sinatra', :tag =>'v2.1.0'

gem 'concurrent-ruby', '1.3.4'
gem 'database_cleaner'
gem 'delayed_job', '4.1.9', :require => false
gem 'generator_spec'
Expand Down
1 change: 1 addition & 0 deletions gemfiles/rails70.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ gem 'sucker_punch', '~> 2.0'
# We need last sinatra that uses rack 2.x and ruby 2.5.x
gem 'sinatra', :git => 'https://github.com/sinatra/sinatra', :tag =>'v2.1.0'

gem 'concurrent-ruby', '1.3.4'
gem 'database_cleaner'
gem 'delayed_job', '4.1.10', :require => false
gem 'generator_spec'
Expand Down

0 comments on commit 9c916bb

Please sign in to comment.