Skip to content

Commit

Permalink
Expand rack matrix with latest
Browse files Browse the repository at this point in the history
  • Loading branch information
TonyCTHsu committed Sep 25, 2024
1 parent 2209a7c commit 6df2e6e
Show file tree
Hide file tree
Showing 14 changed files with 24 additions and 86 deletions.
6 changes: 3 additions & 3 deletions Appraisals
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,14 @@ def build_coverage_matrix(integration, range, gem: nil, min: nil, meta: {})
if min
appraise "#{integration}-min" do
gem gem, "= #{min}"
meta.each { |k, v| gem k, v }
meta.each { |k, v| v ? gem(k, v) : gem(k) }
end
end

range.each do |n|
appraise "#{integration}-#{n}" do
gem gem, "~> #{n}"
meta.each { |k, v| gem k, v }
meta.each { |k, v| v ? gem(k, v) : gem(k) }
end
end

Expand All @@ -69,7 +69,7 @@ def build_coverage_matrix(integration, range, gem: nil, min: nil, meta: {})
# still requires being updated to pick up the next major version and
# committing the changes to lockfiles.
gem gem
meta.each { |k, v| gem k, v }
meta.each { |k, v| v ? gem(k, v) : gem(k) }
end
end

Expand Down
14 changes: 8 additions & 6 deletions Matrixfile
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,11 @@
'activesupport' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby'
},
'rack' => {
'rack-latest' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby',
'rack-3' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby',
'rack-2' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ 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.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ❌ 3.3 / ❌ 3.4 / ✅ jruby',
'rack-2' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby',
'rack-3' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby',
'rack-1' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ❌ 3.3 / ❌ 3.4 / ✅ jruby',
},
'rake' => {
'contrib' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby'
Expand Down Expand Up @@ -257,10 +258,11 @@
'redis-5' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby'
},
'appsec:rack' => {
'rack-latest' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby',
'rack-3' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby',
'rack-2' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ 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.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ❌ 3.3 / ❌ 3.4 / ✅ jruby',
'rack-2' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby',
'rack-3' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby',
'rack-1' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ❌ 3.3 / ❌ 3.4 / ✅ jruby',
},
'appsec:sinatra' => {
'sinatra-2' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby',
Expand Down
8 changes: 1 addition & 7 deletions appraisal/jruby-9.2.rb
Original file line number Diff line number Diff line change
Expand Up @@ -244,13 +244,7 @@
end
end

[1, 2, 3].each do |n|
appraise "rack-#{n}" do
gem 'rack', "~> #{n}"
gem 'rack-contrib'
gem 'rack-test' # Dev dependencies for testing rack-based code
end
end
build_coverage_matrix('rack', 1..3, meta: { 'rack-contrib' => nil, 'rack-test' => nil })

[2].each do |n|
appraise "sinatra-#{n}" do
Expand Down
8 changes: 1 addition & 7 deletions appraisal/jruby-9.3.rb
Original file line number Diff line number Diff line change
Expand Up @@ -217,13 +217,7 @@
end
end

[1, 2, 3].each do |n|
appraise "rack-#{n}" do
gem 'rack', "~> #{n}"
gem 'rack-contrib'
gem 'rack-test' # Dev dependencies for testing rack-based code
end
end
build_coverage_matrix('rack', 1..3, meta: { 'rack-contrib' => nil, 'rack-test' => nil })

[2, 3].each do |n|
appraise "sinatra-#{n}" do
Expand Down
8 changes: 1 addition & 7 deletions appraisal/jruby-9.4.rb
Original file line number Diff line number Diff line change
Expand Up @@ -129,13 +129,7 @@
end
end

[1, 2, 3].each do |n|
appraise "rack-#{n}" do
gem 'rack', "~> #{n}"
gem 'rack-contrib'
gem 'rack-test' # Dev dependencies for testing rack-based code
end
end
build_coverage_matrix('rack', 1..3, meta: { 'rack-contrib' => nil, 'rack-test' => nil })

[2, 3, 4].each do |n|
appraise "sinatra-#{n}" do
Expand Down
8 changes: 1 addition & 7 deletions appraisal/ruby-2.5.rb
Original file line number Diff line number Diff line change
Expand Up @@ -264,13 +264,7 @@
end
end

[1, 2, 3].each do |n|
appraise "rack-#{n}" do
gem 'rack', "~> #{n}"
gem 'rack-contrib'
gem 'rack-test' # Dev dependencies for testing rack-based code
end
end
build_coverage_matrix('rack', 1..3, meta: { 'rack-contrib' => nil, 'rack-test' => nil })

[2].each do |n|
appraise "sinatra-#{n}" do
Expand Down
8 changes: 1 addition & 7 deletions appraisal/ruby-2.6.rb
Original file line number Diff line number Diff line change
Expand Up @@ -218,13 +218,7 @@
end
end

[1, 2, 3].each do |n|
appraise "rack-#{n}" do
gem 'rack', "~> #{n}"
gem 'rack-contrib'
gem 'rack-test' # Dev dependencies for testing rack-based code
end
end
build_coverage_matrix('rack', 1..3, meta: { 'rack-contrib' => nil, 'rack-test' => nil })

[2, 3].each do |n|
appraise "sinatra-#{n}" do
Expand Down
8 changes: 1 addition & 7 deletions appraisal/ruby-2.7.rb
Original file line number Diff line number Diff line change
Expand Up @@ -220,13 +220,7 @@
end
end

[1, 2, 3].each do |n|
appraise "rack-#{n}" do
gem 'rack', "~> #{n}"
gem 'rack-contrib'
gem 'rack-test' # Dev dependencies for testing rack-based code
end
end
build_coverage_matrix('rack', 1..3, meta: { 'rack-contrib' => nil, 'rack-test' => nil })

# Sinatra 4 requires Ruby (>= 2.7.8), but current image with Ruby 2.7.6
[2, 3].each do |n|
Expand Down
8 changes: 1 addition & 7 deletions appraisal/ruby-3.0.rb
Original file line number Diff line number Diff line change
Expand Up @@ -148,13 +148,7 @@
end
end

[1, 2, 3].each do |n|
appraise "rack-#{n}" do
gem 'rack', "~> #{n}"
gem 'rack-contrib'
gem 'rack-test' # Dev dependencies for testing rack-based code
end
end
build_coverage_matrix('rack', 1..3, meta: { 'rack-contrib' => nil, 'rack-test' => nil })

[2, 3, 4].each do |n|
appraise "sinatra-#{n}" do
Expand Down
8 changes: 1 addition & 7 deletions appraisal/ruby-3.1.rb
Original file line number Diff line number Diff line change
Expand Up @@ -148,13 +148,7 @@
end
end

[1, 2, 3].each do |n|
appraise "rack-#{n}" do
gem 'rack', "~> #{n}"
gem 'rack-contrib'
gem 'rack-test' # Dev dependencies for testing rack-based code
end
end
build_coverage_matrix('rack', 1..3, meta: { 'rack-contrib' => nil, 'rack-test' => nil })

[2, 3, 4].each do |n|
appraise "sinatra-#{n}" do
Expand Down
8 changes: 1 addition & 7 deletions appraisal/ruby-3.2.rb
Original file line number Diff line number Diff line change
Expand Up @@ -148,13 +148,7 @@
end
end

[1, 2, 3].each do |n|
appraise "rack-#{n}" do
gem 'rack', "~> #{n}"
gem 'rack-contrib'
gem 'rack-test' # Dev dependencies for testing rack-based code
end
end
build_coverage_matrix('rack', 1..3, meta: { 'rack-contrib' => nil, 'rack-test' => nil })

[2, 3, 4].each do |n|
appraise "sinatra-#{n}" do
Expand Down
8 changes: 1 addition & 7 deletions appraisal/ruby-3.3.rb
Original file line number Diff line number Diff line change
Expand Up @@ -148,13 +148,7 @@
end
end

[2, 3].each do |n|
appraise "rack-#{n}" do
gem 'rack', "~> #{n}"
gem 'rack-contrib'
gem 'rack-test' # Dev dependencies for testing rack-based code
end
end
build_coverage_matrix('rack', 2..3, meta: { 'rack-contrib' => nil, 'rack-test' => nil })

[2, 3, 4].each do |n|
appraise "sinatra-#{n}" do
Expand Down
8 changes: 1 addition & 7 deletions appraisal/ruby-3.4.rb
Original file line number Diff line number Diff line change
Expand Up @@ -149,13 +149,7 @@
end
end

[2, 3].each do |n|
appraise "rack-#{n}" do
gem 'rack', "~> #{n}"
gem 'rack-contrib'
gem 'rack-test' # Dev dependencies for testing rack-based code
end
end
build_coverage_matrix('rack', 2..3, meta: { 'rack-contrib' => nil, 'rack-test' => nil })

[2, 3, 4].each do |n|
appraise "sinatra-#{n}" do
Expand Down
2 changes: 2 additions & 0 deletions tasks/edge.rake
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ namespace :edge do
'stripe' => 'stripe',
'elasticsearch' => 'elasticsearch',
'opensearch' => 'opensearch-ruby',
'rack' => 'rack',
# Add more integrations here, when they are extracted to its own isolated group
}

Expand Down Expand Up @@ -45,6 +46,7 @@ namespace :edge do
'stripe' => 'stripe',
'elasticsearch' => 'elasticsearch',
'opensearch' => 'opensearch-ruby',
'rack' => 'rack',
# Add more integrations here, when hey are extracted to its own isolated group
}

Expand Down

0 comments on commit 6df2e6e

Please sign in to comment.