Merge pull request #4415 from DataDog/tonycthsu/cleanup-matrix

Remove redundant groups

Author: TonyCTHsu

Matrixfile

@@ -64,7 +64,6 @@
   },
   'elasticsearch' => {
     'elasticsearch-latest' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby',
-    'elasticsearch-8'      => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby',
     'elasticsearch-7'      => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby',
   },
   'ethon' => {
@@ -121,7 +120,6 @@
   },
   'opensearch' => {
     'opensearch-latest' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby',
-    'opensearch-3'      => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby',
     'opensearch-2'      => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby',
   },
   'pg' => {
@@ -138,7 +136,6 @@
   },
   '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',
@@ -268,7 +265,6 @@
   },
   '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',

appraisal/jruby-9.2.rb

@@ -198,8 +198,8 @@
 end
 
 build_coverage_matrix('stripe', 7..12, min: '5.15.0')
-build_coverage_matrix('opensearch', 2..3, gem: 'opensearch-ruby')
-build_coverage_matrix('elasticsearch', 7..8)
+build_coverage_matrix('opensearch', [2], gem: 'opensearch-ruby')
+build_coverage_matrix('elasticsearch', [7])
 build_coverage_matrix('faraday', min: '0.14.0')
 build_coverage_matrix('excon')
 build_coverage_matrix('mongo', min: '2.1.0')
@@ -255,7 +255,7 @@
   end
 end
 
-build_coverage_matrix('rack', 1..3, meta: { 'rack-contrib' => nil, 'rack-test' => nil })
+build_coverage_matrix('rack', 1..2, meta: { 'rack-contrib' => nil, 'rack-test' => nil })
 
 [2].each do |n|
   appraise "sinatra-#{n}" do

appraisal/jruby-9.3.rb

@@ -171,8 +171,8 @@
 end
 
 build_coverage_matrix('stripe', 7..12, min: '5.15.0')
-build_coverage_matrix('opensearch', 2..3, gem: 'opensearch-ruby')
-build_coverage_matrix('elasticsearch', 7..8)
+build_coverage_matrix('opensearch', [2], gem: 'opensearch-ruby')
+build_coverage_matrix('elasticsearch', [7])
 build_coverage_matrix('faraday', min: '0.14.0')
 build_coverage_matrix('excon')
 build_coverage_matrix('mongo', min: '2.1.0')
@@ -228,7 +228,7 @@
   end
 end
 
-build_coverage_matrix('rack', 1..3, meta: { 'rack-contrib' => nil, 'rack-test' => nil })
+build_coverage_matrix('rack', 1..2, meta: { 'rack-contrib' => nil, 'rack-test' => nil })
 
 [2, 3].each do |n|
   appraise "sinatra-#{n}" do

appraisal/jruby-9.4.rb

@@ -75,8 +75,8 @@
 end
 
 build_coverage_matrix('stripe', 7..12, min: '5.15.0')
-build_coverage_matrix('opensearch', 2..3, gem: 'opensearch-ruby')
-build_coverage_matrix('elasticsearch', 7..8)
+build_coverage_matrix('opensearch', [2], gem: 'opensearch-ruby')
+build_coverage_matrix('elasticsearch', [7])
 build_coverage_matrix('faraday')
 build_coverage_matrix('excon')
 build_coverage_matrix('mongo', min: '2.1.0')
@@ -140,7 +140,7 @@
   end
 end
 
-build_coverage_matrix('rack', 1..3, meta: { 'rack-contrib' => nil, 'rack-test' => nil })
+build_coverage_matrix('rack', 1..2, meta: { 'rack-contrib' => nil, 'rack-test' => nil })
 
 [2, 3, 4].each do |n|
   appraise "sinatra-#{n}" do

appraisal/ruby-2.5.rb

@@ -217,8 +217,8 @@
 end
 
 build_coverage_matrix('stripe', 7..12, min: '5.15.0')
-build_coverage_matrix('opensearch', 2..3, gem: 'opensearch-ruby')
-build_coverage_matrix('elasticsearch', 7..8)
+build_coverage_matrix('opensearch', [2], gem: 'opensearch-ruby')
+build_coverage_matrix('elasticsearch', [7])
 build_coverage_matrix('faraday', min: '0.14.0')
 build_coverage_matrix('excon')
 build_coverage_matrix('mongo', min: '2.1.0')
@@ -274,7 +274,7 @@
   end
 end
 
-build_coverage_matrix('rack', 1..3, meta: { 'rack-contrib' => nil, 'rack-test' => nil })
+build_coverage_matrix('rack', 1..2, meta: { 'rack-contrib' => nil, 'rack-test' => nil })
 
 [2].each do |n|
   appraise "sinatra-#{n}" do

appraisal/ruby-2.6.rb

@@ -170,8 +170,8 @@
 end
 
 build_coverage_matrix('stripe', 7..12, min: '5.15.0')
-build_coverage_matrix('opensearch', 2..3, gem: 'opensearch-ruby')
-build_coverage_matrix('elasticsearch', 7..8)
+build_coverage_matrix('opensearch', [2], gem: 'opensearch-ruby')
+build_coverage_matrix('elasticsearch', [7])
 build_coverage_matrix('faraday', min: '0.14.0')
 build_coverage_matrix('excon')
 build_coverage_matrix('mongo', min: '2.1.0')
@@ -228,7 +228,7 @@
   end
 end
 
-build_coverage_matrix('rack', 1..3, meta: { 'rack-contrib' => nil, 'rack-test' => nil })
+build_coverage_matrix('rack', 1..2, meta: { 'rack-contrib' => nil, 'rack-test' => nil })
 
 [2, 3].each do |n|
   appraise "sinatra-#{n}" do

appraisal/ruby-2.7.rb

@@ -170,8 +170,8 @@
 end
 
 build_coverage_matrix('stripe', 7..12, min: '5.15.0')
-build_coverage_matrix('opensearch', 2..3, gem: 'opensearch-ruby')
-build_coverage_matrix('elasticsearch', 7..8)
+build_coverage_matrix('opensearch', [2], gem: 'opensearch-ruby')
+build_coverage_matrix('elasticsearch', [7])
 build_coverage_matrix('faraday', min: '0.14.0')
 build_coverage_matrix('excon')
 build_coverage_matrix('mongo', min: '2.1.0')
@@ -230,7 +230,7 @@
   end
 end
 
-build_coverage_matrix('rack', 1..3, meta: { 'rack-contrib' => nil, 'rack-test' => nil })
+build_coverage_matrix('rack', 1..2, 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|

appraisal/ruby-3.0.rb

@@ -91,8 +91,8 @@
 end
 
 build_coverage_matrix('stripe', 7..12, min: '5.15.0')
-build_coverage_matrix('opensearch', 2..3, gem: 'opensearch-ruby')
-build_coverage_matrix('elasticsearch', 7..8)
+build_coverage_matrix('opensearch', [2], gem: 'opensearch-ruby')
+build_coverage_matrix('elasticsearch', [7])
 build_coverage_matrix('faraday')
 build_coverage_matrix('excon')
 build_coverage_matrix('mongo', min: '2.1.0')
@@ -158,7 +158,7 @@
   end
 end
 
-build_coverage_matrix('rack', 1..3, meta: { 'rack-contrib' => nil, 'rack-test' => nil })
+build_coverage_matrix('rack', 1..2, meta: { 'rack-contrib' => nil, 'rack-test' => nil })
 
 [2, 3, 4].each do |n|
   appraise "sinatra-#{n}" do

appraisal/ruby-3.1.rb

@@ -91,8 +91,8 @@
 end
 
 build_coverage_matrix('stripe', 7..12, min: '5.15.0')
-build_coverage_matrix('opensearch', 2..3, gem: 'opensearch-ruby')
-build_coverage_matrix('elasticsearch', 7..8)
+build_coverage_matrix('opensearch', [2], gem: 'opensearch-ruby')
+build_coverage_matrix('elasticsearch', [7])
 build_coverage_matrix('faraday')
 build_coverage_matrix('excon')
 build_coverage_matrix('mongo', min: '2.1.0')
@@ -158,7 +158,7 @@
   end
 end
 
-build_coverage_matrix('rack', 1..3, meta: { 'rack-contrib' => nil, 'rack-test' => nil })
+build_coverage_matrix('rack', 1..2, meta: { 'rack-contrib' => nil, 'rack-test' => nil })
 
 [2, 3, 4].each do |n|
   appraise "sinatra-#{n}" do

appraisal/ruby-3.2.rb

@@ -91,8 +91,8 @@
 end
 
 build_coverage_matrix('stripe', 7..12, min: '5.15.0')
-build_coverage_matrix('opensearch', 2..3, gem: 'opensearch-ruby')
-build_coverage_matrix('elasticsearch', 7..8)
+build_coverage_matrix('opensearch', [2], gem: 'opensearch-ruby')
+build_coverage_matrix('elasticsearch', [7])
 build_coverage_matrix('faraday')
 build_coverage_matrix('excon')
 build_coverage_matrix('mongo', min: '2.1.0')
@@ -158,7 +158,7 @@
   end
 end
 
-build_coverage_matrix('rack', 1..3, meta: { 'rack-contrib' => nil, 'rack-test' => nil })
+build_coverage_matrix('rack', 1..2, meta: { 'rack-contrib' => nil, 'rack-test' => nil })
 
 [2, 3, 4].each do |n|
   appraise "sinatra-#{n}" do