Skip to content

Commit 362a60a

Browse files
committed
Remove redundant groups
1 parent f710dac commit 362a60a

File tree

78 files changed

+33
-6338
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+33
-6338
lines changed

Matrixfile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@
6464
},
6565
'elasticsearch' => {
6666
'elasticsearch-latest' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby',
67-
'elasticsearch-8' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby',
6867
'elasticsearch-7' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby',
6968
},
7069
'ethon' => {
@@ -121,7 +120,6 @@
121120
},
122121
'opensearch' => {
123122
'opensearch-latest' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby',
124-
'opensearch-3' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby',
125123
'opensearch-2' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby',
126124
},
127125
'pg' => {
@@ -138,7 +136,6 @@
138136
},
139137
'rack' => {
140138
'rack-latest' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby',
141-
'rack-3' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby',
142139
'rack-2' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby',
143140
# Non-deprecated form of Regexp.new does not backport to Rack 1.x, see: https://github.com/rack/rack/pull/1998
144141
'rack-1' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ❌ 3.3 / ❌ 3.4 / ✅ jruby',
@@ -268,7 +265,6 @@
268265
},
269266
'appsec:rack' => {
270267
'rack-latest' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby',
271-
'rack-3' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby',
272268
'rack-2' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby',
273269
# Non-deprecated form of Regexp.new does not backport to Rack 1.x, see: https://github.com/rack/rack/pull/1998
274270
'rack-1' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ❌ 3.3 / ❌ 3.4 / ✅ jruby',

appraisal/jruby-9.2.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -198,8 +198,8 @@
198198
end
199199

200200
build_coverage_matrix('stripe', 7..12, min: '5.15.0')
201-
build_coverage_matrix('opensearch', 2..3, gem: 'opensearch-ruby')
202-
build_coverage_matrix('elasticsearch', 7..8)
201+
build_coverage_matrix('opensearch', [2], gem: 'opensearch-ruby')
202+
build_coverage_matrix('elasticsearch', [7])
203203
build_coverage_matrix('faraday', min: '0.14.0')
204204
build_coverage_matrix('excon')
205205
build_coverage_matrix('mongo', min: '2.1.0')
@@ -255,7 +255,7 @@
255255
end
256256
end
257257

258-
build_coverage_matrix('rack', 1..3, meta: { 'rack-contrib' => nil, 'rack-test' => nil })
258+
build_coverage_matrix('rack', 1..2, meta: { 'rack-contrib' => nil, 'rack-test' => nil })
259259

260260
[2].each do |n|
261261
appraise "sinatra-#{n}" do

appraisal/jruby-9.3.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -171,8 +171,8 @@
171171
end
172172

173173
build_coverage_matrix('stripe', 7..12, min: '5.15.0')
174-
build_coverage_matrix('opensearch', 2..3, gem: 'opensearch-ruby')
175-
build_coverage_matrix('elasticsearch', 7..8)
174+
build_coverage_matrix('opensearch', [2], gem: 'opensearch-ruby')
175+
build_coverage_matrix('elasticsearch', [7])
176176
build_coverage_matrix('faraday', min: '0.14.0')
177177
build_coverage_matrix('excon')
178178
build_coverage_matrix('mongo', min: '2.1.0')
@@ -228,7 +228,7 @@
228228
end
229229
end
230230

231-
build_coverage_matrix('rack', 1..3, meta: { 'rack-contrib' => nil, 'rack-test' => nil })
231+
build_coverage_matrix('rack', 1..2, meta: { 'rack-contrib' => nil, 'rack-test' => nil })
232232

233233
[2, 3].each do |n|
234234
appraise "sinatra-#{n}" do

appraisal/jruby-9.4.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@
7575
end
7676

7777
build_coverage_matrix('stripe', 7..12, min: '5.15.0')
78-
build_coverage_matrix('opensearch', 2..3, gem: 'opensearch-ruby')
79-
build_coverage_matrix('elasticsearch', 7..8)
78+
build_coverage_matrix('opensearch', [2], gem: 'opensearch-ruby')
79+
build_coverage_matrix('elasticsearch', [7])
8080
build_coverage_matrix('faraday')
8181
build_coverage_matrix('excon')
8282
build_coverage_matrix('mongo', min: '2.1.0')
@@ -140,7 +140,7 @@
140140
end
141141
end
142142

143-
build_coverage_matrix('rack', 1..3, meta: { 'rack-contrib' => nil, 'rack-test' => nil })
143+
build_coverage_matrix('rack', 1..2, meta: { 'rack-contrib' => nil, 'rack-test' => nil })
144144

145145
[2, 3, 4].each do |n|
146146
appraise "sinatra-#{n}" do

appraisal/ruby-2.5.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -217,8 +217,8 @@
217217
end
218218

219219
build_coverage_matrix('stripe', 7..12, min: '5.15.0')
220-
build_coverage_matrix('opensearch', 2..3, gem: 'opensearch-ruby')
221-
build_coverage_matrix('elasticsearch', 7..8)
220+
build_coverage_matrix('opensearch', [2], gem: 'opensearch-ruby')
221+
build_coverage_matrix('elasticsearch', [7])
222222
build_coverage_matrix('faraday', min: '0.14.0')
223223
build_coverage_matrix('excon')
224224
build_coverage_matrix('mongo', min: '2.1.0')
@@ -274,7 +274,7 @@
274274
end
275275
end
276276

277-
build_coverage_matrix('rack', 1..3, meta: { 'rack-contrib' => nil, 'rack-test' => nil })
277+
build_coverage_matrix('rack', 1..2, meta: { 'rack-contrib' => nil, 'rack-test' => nil })
278278

279279
[2].each do |n|
280280
appraise "sinatra-#{n}" do

appraisal/ruby-2.6.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,8 @@
170170
end
171171

172172
build_coverage_matrix('stripe', 7..12, min: '5.15.0')
173-
build_coverage_matrix('opensearch', 2..3, gem: 'opensearch-ruby')
174-
build_coverage_matrix('elasticsearch', 7..8)
173+
build_coverage_matrix('opensearch', [2], gem: 'opensearch-ruby')
174+
build_coverage_matrix('elasticsearch', [7])
175175
build_coverage_matrix('faraday', min: '0.14.0')
176176
build_coverage_matrix('excon')
177177
build_coverage_matrix('mongo', min: '2.1.0')
@@ -228,7 +228,7 @@
228228
end
229229
end
230230

231-
build_coverage_matrix('rack', 1..3, meta: { 'rack-contrib' => nil, 'rack-test' => nil })
231+
build_coverage_matrix('rack', 1..2, meta: { 'rack-contrib' => nil, 'rack-test' => nil })
232232

233233
[2, 3].each do |n|
234234
appraise "sinatra-#{n}" do

appraisal/ruby-2.7.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,8 @@
170170
end
171171

172172
build_coverage_matrix('stripe', 7..12, min: '5.15.0')
173-
build_coverage_matrix('opensearch', 2..3, gem: 'opensearch-ruby')
174-
build_coverage_matrix('elasticsearch', 7..8)
173+
build_coverage_matrix('opensearch', [2], gem: 'opensearch-ruby')
174+
build_coverage_matrix('elasticsearch', [7])
175175
build_coverage_matrix('faraday', min: '0.14.0')
176176
build_coverage_matrix('excon')
177177
build_coverage_matrix('mongo', min: '2.1.0')
@@ -230,7 +230,7 @@
230230
end
231231
end
232232

233-
build_coverage_matrix('rack', 1..3, meta: { 'rack-contrib' => nil, 'rack-test' => nil })
233+
build_coverage_matrix('rack', 1..2, meta: { 'rack-contrib' => nil, 'rack-test' => nil })
234234

235235
# Sinatra 4 requires Ruby (>= 2.7.8), but current image with Ruby 2.7.6
236236
[2, 3].each do |n|

appraisal/ruby-3.0.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@
9191
end
9292

9393
build_coverage_matrix('stripe', 7..12, min: '5.15.0')
94-
build_coverage_matrix('opensearch', 2..3, gem: 'opensearch-ruby')
95-
build_coverage_matrix('elasticsearch', 7..8)
94+
build_coverage_matrix('opensearch', [2], gem: 'opensearch-ruby')
95+
build_coverage_matrix('elasticsearch', [7])
9696
build_coverage_matrix('faraday')
9797
build_coverage_matrix('excon')
9898
build_coverage_matrix('mongo', min: '2.1.0')
@@ -158,7 +158,7 @@
158158
end
159159
end
160160

161-
build_coverage_matrix('rack', 1..3, meta: { 'rack-contrib' => nil, 'rack-test' => nil })
161+
build_coverage_matrix('rack', 1..2, meta: { 'rack-contrib' => nil, 'rack-test' => nil })
162162

163163
[2, 3, 4].each do |n|
164164
appraise "sinatra-#{n}" do

appraisal/ruby-3.1.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@
9191
end
9292

9393
build_coverage_matrix('stripe', 7..12, min: '5.15.0')
94-
build_coverage_matrix('opensearch', 2..3, gem: 'opensearch-ruby')
95-
build_coverage_matrix('elasticsearch', 7..8)
94+
build_coverage_matrix('opensearch', [2], gem: 'opensearch-ruby')
95+
build_coverage_matrix('elasticsearch', [7])
9696
build_coverage_matrix('faraday')
9797
build_coverage_matrix('excon')
9898
build_coverage_matrix('mongo', min: '2.1.0')
@@ -158,7 +158,7 @@
158158
end
159159
end
160160

161-
build_coverage_matrix('rack', 1..3, meta: { 'rack-contrib' => nil, 'rack-test' => nil })
161+
build_coverage_matrix('rack', 1..2, meta: { 'rack-contrib' => nil, 'rack-test' => nil })
162162

163163
[2, 3, 4].each do |n|
164164
appraise "sinatra-#{n}" do

appraisal/ruby-3.2.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@
9191
end
9292

9393
build_coverage_matrix('stripe', 7..12, min: '5.15.0')
94-
build_coverage_matrix('opensearch', 2..3, gem: 'opensearch-ruby')
95-
build_coverage_matrix('elasticsearch', 7..8)
94+
build_coverage_matrix('opensearch', [2], gem: 'opensearch-ruby')
95+
build_coverage_matrix('elasticsearch', [7])
9696
build_coverage_matrix('faraday')
9797
build_coverage_matrix('excon')
9898
build_coverage_matrix('mongo', min: '2.1.0')
@@ -158,7 +158,7 @@
158158
end
159159
end
160160

161-
build_coverage_matrix('rack', 1..3, meta: { 'rack-contrib' => nil, 'rack-test' => nil })
161+
build_coverage_matrix('rack', 1..2, meta: { 'rack-contrib' => nil, 'rack-test' => nil })
162162

163163
[2, 3, 4].each do |n|
164164
appraise "sinatra-#{n}" do

0 commit comments

Comments
 (0)