Skip to content

Commit 9c916bb

Browse files
authored
ci: pin concurrent-ruby version for older rails versions (#1176)
1 parent 1e9aa28 commit 9c916bb

7 files changed

Lines changed: 12 additions & 1 deletion

File tree

Gemfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ else
2727
gem 'rspec-rails', '~> 6.0.3'
2828
end
2929

30+
if GEMFILE_RAILS_VERSION < '7.1'
31+
gem 'concurrent-ruby', '1.3.4'
32+
end
33+
3034
if GEMFILE_RAILS_VERSION < '6.0'
3135
gem 'sqlite3', '< 1.4.0', :platform => [:ruby, :mswin, :mingw]
3236
else

gemfiles/rails50.gemfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,15 @@ gem 'sucker_punch', '~> 2.0'
3434

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

37-
# We need last sinatra that uses rack 2.1.x
37+
gem 'concurrent-ruby', '1.3.4'
3838
gem 'database_cleaner', '~> 1.8.4'
3939
gem 'delayed_job', :require => false
4040
gem 'generator_spec'
4141
gem 'redis', '<= 3.3.5'
4242
gem 'resque'
4343
gem 'secure_headers', '~> 6.3.2', :require => false
44+
45+
# We need last sinatra that uses rack 2.1.x
4446
gem 'sinatra', :git => 'https://github.com/sinatra/sinatra', :tag => 'v2.0.8'
4547

4648
unless is_jruby

gemfiles/rails51.gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ gem 'rack', '2.1.2' if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3')
3737
# We need last sinatra that uses rack 2.1.x
3838
gem 'sinatra', :git => 'https://github.com/sinatra/sinatra', :tag => 'v2.0.8'
3939

40+
gem 'concurrent-ruby', '1.3.4'
4041
gem 'database_cleaner', '~> 1.8.4'
4142
gem 'delayed_job', :require => false
4243
gem 'generator_spec'

gemfiles/rails52.gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ gem 'sucker_punch', '~> 2.0'
3131
# We need last sinatra that uses rack 2.x and ruby 2.5.x
3232
gem 'sinatra', :git => 'https://github.com/sinatra/sinatra', :tag =>'v2.1.0'
3333

34+
gem 'concurrent-ruby', '1.3.4'
3435
gem 'database_cleaner'
3536
gem 'delayed_job', :require => false
3637
gem 'generator_spec'

gemfiles/rails60.gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ gem 'sucker_punch', '~> 2.0'
2727
# We need last sinatra that uses rack 2.x and ruby 2.5.x
2828
gem 'sinatra', :git => 'https://github.com/sinatra/sinatra', :tag =>'v2.1.0'
2929

30+
gem 'concurrent-ruby', '1.3.4'
3031
gem 'database_cleaner'
3132
gem 'delayed_job', '4.1.9', :require => false
3233
gem 'generator_spec'

gemfiles/rails61.gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ gem 'sucker_punch', '~> 2.0'
2727
# We need last sinatra that uses rack 2.x and ruby 2.5.x
2828
gem 'sinatra', :git => 'https://github.com/sinatra/sinatra', :tag =>'v2.1.0'
2929

30+
gem 'concurrent-ruby', '1.3.4'
3031
gem 'database_cleaner'
3132
gem 'delayed_job', '4.1.9', :require => false
3233
gem 'generator_spec'

gemfiles/rails70.gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ gem 'sucker_punch', '~> 2.0'
2727
# We need last sinatra that uses rack 2.x and ruby 2.5.x
2828
gem 'sinatra', :git => 'https://github.com/sinatra/sinatra', :tag =>'v2.1.0'
2929

30+
gem 'concurrent-ruby', '1.3.4'
3031
gem 'database_cleaner'
3132
gem 'delayed_job', '4.1.10', :require => false
3233
gem 'generator_spec'

0 commit comments

Comments
 (0)