Skip to content

Commit

Permalink
Merge pull request #3132 from DataDog/tonycthsu/rack-3-support
Browse files Browse the repository at this point in the history
Support Rack 3 by adding to test matrix
  • Loading branch information
TonyCTHsu committed Sep 25, 2023
2 parents bae0e04 + c81c93b commit 20c8800
Show file tree
Hide file tree
Showing 91 changed files with 8,358 additions and 6 deletions.
10 changes: 8 additions & 2 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,10 @@ TEST_METADATA = {
'activesupport' => '❌ 2.1 / ✅ 2.2 / ✅ 2.3 / ✅ 2.4 / ✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ jruby'
},
'rack' => {
'contrib' => '✅ 2.1 / ✅ 2.2 / ✅ 2.3 / ✅ 2.4 / ✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ jruby'
# Non-deprecated form of Regexp.new does not backport to Rack 1.x, see: https://github.com/rack/rack/pull/1998
'rack-1' => '✅ 2.1 / ✅ 2.2 / ✅ 2.3 / ✅ 2.4 / ✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ❌ 3.3 / ✅ jruby',
'rack-2' => '❌ 2.1 / ❌ 2.2 / ✅ 2.3 / ✅ 2.4 / ✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ jruby',
'rack-3' => '❌ 2.1 / ❌ 2.2 / ❌ 2.3 / ✅ 2.4 / ✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ jruby',
},
'rake' => {
'contrib' => '✅ 2.1 / ✅ 2.2 / ✅ 2.3 / ✅ 2.4 / ✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ jruby'
Expand Down Expand Up @@ -239,7 +242,10 @@ TEST_METADATA = {
'redis-5' => '❌ 2.1 / ❌ 2.2 / ❌ 2.3 / ❌ 2.4 / ✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ jruby'
},
'appsec:rack' => {
'contrib' => '✅ 2.1 / ✅ 2.2 / ✅ 2.3 / ✅ 2.4 / ✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ jruby'
# Non-deprecated form of Regexp.new does not backport to Rack 1.x, see: https://github.com/rack/rack/pull/1998
'rack-1' => '✅ 2.1 / ✅ 2.2 / ✅ 2.3 / ✅ 2.4 / ✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ❌ 3.3 / ✅ jruby',
'rack-2' => '❌ 2.1 / ❌ 2.2 / ✅ 2.3 / ✅ 2.4 / ✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ jruby',
'rack-3' => '❌ 2.1 / ❌ 2.2 / ❌ 2.3 / ✅ 2.4 / ✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ jruby',
},
'appsec:sinatra' => {
'contrib' => '✅ 2.1 / ✅ 2.2 / ✅ 2.3 / ✅ 2.4 / ✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ jruby'
Expand Down
8 changes: 8 additions & 0 deletions appraisal/jruby-9.2.21.0.rb
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,14 @@
gem 'que', '>= 1.0.0', '< 2.0.0'
end

[1, 2, 3].each do |n|
appraise "rack-#{n}" do
gem 'rack', "~> #{n}"
gem 'rack-contrib'
gem 'rack-test'
end
end

appraise 'sinatra' do
gem 'sinatra'
gem 'rack-test'
Expand Down
8 changes: 8 additions & 0 deletions appraisal/jruby-9.3.9.0.rb
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,14 @@
gem 'que', '>= 1.0.0', '< 2.0.0'
end

[1, 2, 3].each do |n|
appraise "rack-#{n}" do
gem 'rack', "~> #{n}"
gem 'rack-contrib'
gem 'rack-test'
end
end

appraise 'sinatra' do
gem 'sinatra', '>= 3'
gem 'rack-test'
Expand Down
8 changes: 8 additions & 0 deletions appraisal/jruby-9.4.0.0.rb
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,14 @@
end
end

[1, 2, 3].each do |n|
appraise "rack-#{n}" do
gem 'rack', "~> #{n}"
gem 'rack-contrib'
gem 'rack-test'
end
end

appraise 'sinatra' do
gem 'sinatra', '>= 3'
gem 'rack-test'
Expand Down
8 changes: 8 additions & 0 deletions appraisal/ruby-2.1.10.rb
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,14 @@
gem 'timers', '< 4.2'
end

[1].each do |n|
appraise "rack-#{n}" do
gem 'rack', "~> #{n}"
gem 'rack-contrib'
gem 'rack-test'
end
end

appraise 'sinatra' do
gem 'sinatra'
gem 'rack-test'
Expand Down
8 changes: 8 additions & 0 deletions appraisal/ruby-2.2.10.rb
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,14 @@
gem 'que', '>= 1.0.0', '< 2.0.0'
end

[1].each do |n|
appraise "rack-#{n}" do
gem 'rack', "~> #{n}"
gem 'rack-contrib'
gem 'rack-test'
end
end

appraise 'sinatra' do
gem 'sinatra'
gem 'rack-test'
Expand Down
8 changes: 8 additions & 0 deletions appraisal/ruby-2.3.8.rb
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,14 @@
gem 'que', '>= 1.0.0', '< 2.0.0'
end

[1, 2].each do |n|
appraise "rack-#{n}" do
gem 'rack', "~> #{n}"
gem 'rack-contrib'
gem 'rack-test'
end
end

appraise 'sinatra' do
gem 'sinatra', '< 3.0'
gem 'mustermann', '< 3.0'
Expand Down
8 changes: 8 additions & 0 deletions appraisal/ruby-2.4.10.rb
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,14 @@
gem 'makara', '~> 0.3.0'
end

[1, 2, 3].each do |n|
appraise "rack-#{n}" do
gem 'rack', "~> #{n}"
gem 'rack-contrib'
gem 'rack-test'
end
end

appraise 'sinatra' do
gem 'sinatra'
gem 'rack-test'
Expand Down
8 changes: 8 additions & 0 deletions appraisal/ruby-2.5.9.rb
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,14 @@
gem 'que', '>= 1.0.0', '< 2.0.0'
end

[1, 2, 3].each do |n|
appraise "rack-#{n}" do
gem 'rack', "~> #{n}"
gem 'rack-contrib'
gem 'rack-test'
end
end

appraise 'sinatra' do
gem 'sinatra'
gem 'rack-test'
Expand Down
8 changes: 8 additions & 0 deletions appraisal/ruby-2.6.10.rb
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,14 @@
gem 'que', '>= 1.0.0', '< 2.0.0'
end

[1, 2, 3].each do |n|
appraise "rack-#{n}" do
gem 'rack', "~> #{n}"
gem 'rack-contrib'
gem 'rack-test'
end
end

appraise 'sinatra' do
gem 'sinatra', '>= 3'
gem 'rack-test'
Expand Down
8 changes: 8 additions & 0 deletions appraisal/ruby-2.7.6.rb
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,14 @@
gem 'que', '>= 1.0.0'
end

[1, 2, 3].each do |n|
appraise "rack-#{n}" do
gem 'rack', "~> #{n}"
gem 'rack-contrib'
gem 'rack-test'
end
end

appraise 'sinatra' do
gem 'sinatra', '>= 3'
gem 'rack-test'
Expand Down
8 changes: 8 additions & 0 deletions appraisal/ruby-3.0.4.rb
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,14 @@
end
end

[1, 2, 3].each do |n|
appraise "rack-#{n}" do
gem 'rack', "~> #{n}"
gem 'rack-contrib'
gem 'rack-test'
end
end

appraise 'sinatra' do
gem 'sinatra', '>= 3'
gem 'rack-test'
Expand Down
8 changes: 8 additions & 0 deletions appraisal/ruby-3.1.2.rb
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,14 @@
end
end

[1, 2, 3].each do |n|
appraise "rack-#{n}" do
gem 'rack', "~> #{n}"
gem 'rack-contrib'
gem 'rack-test'
end
end

appraise 'sinatra' do
gem 'sinatra', '>= 3'
gem 'rack-test'
Expand Down
8 changes: 8 additions & 0 deletions appraisal/ruby-3.2.0.rb
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,14 @@
end
end

[1, 2, 3].each do |n|
appraise "rack-#{n}" do
gem 'rack', "~> #{n}"
gem 'rack-contrib'
gem 'rack-test'
end
end

appraise 'sinatra' do
gem 'sinatra', '>= 3'
gem 'rack-test'
Expand Down
8 changes: 8 additions & 0 deletions appraisal/ruby-3.3.0.rb
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,14 @@
end
end

[1, 2, 3].each do |n|
appraise "rack-#{n}" do
gem 'rack', "~> #{n}"
gem 'rack-contrib'
gem 'rack-test'
end
end

appraise 'sinatra' do
gem 'sinatra', '>= 3'
gem 'rack-test'
Expand Down
39 changes: 39 additions & 0 deletions gemfiles/jruby_9.2.21.0_rack_1.gemfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 20c8800

Please sign in to comment.