Skip to content

Commit dc11717

Browse files
committed
Remove old versions of rails from test matrix
- See more context in Blacklight issue projectblacklight/blacklight#3493 - Also added 8.x release of blacklight to matrix, since that is what folks are moving towards (or have moved to) - Updated enginecart config based on output
1 parent dc967a3 commit dc11717

File tree

2 files changed

+15
-10
lines changed

2 files changed

+15
-10
lines changed

Diff for: .github/workflows/ruby.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ jobs:
1919
strategy:
2020
matrix:
2121
ruby: ["3.2", "3.3"]
22-
rails_version: ["7.1.3.4", "7.2.0"]
23-
blacklight_version: ["7.38.0"]
22+
rails_version: ["7.1.5.1", "7.2.2.1"]
23+
blacklight_version: ["7.38.0", "8.8.2"]
2424
include:
2525
- ruby: "3.2"
26-
rails_version: "7.1.3.4"
26+
rails_version: "7.1.5.1"
2727
- ruby: "3.3"
28-
rails_version: "7.1.3.4"
28+
rails_version: "7.1.5.1"
2929
name: "Blacklight 8.3"
3030
blacklight_version: "8.3.0"
3131
env:

Diff for: Gemfile

+11-6
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ gemspec
99
# your gem to rubygems.org.
1010

1111
# BEGIN ENGINE_CART BLOCK
12-
# engine_cart: 1.0.1
13-
# engine_cart stanza: 0.10.0
12+
# engine_cart: 2.6.0
13+
# engine_cart stanza: 2.5.0
1414
# the below comes from engine_cart, a gem used to test this Rails engine gem in the context of a Rails app.
1515
file = File.expand_path('Gemfile', ENV['ENGINE_CART_DESTINATION'] || ENV['RAILS_ROOT'] || File.expand_path('.internal_test_app', File.dirname(__FILE__)))
1616
if File.exist?(file)
@@ -30,11 +30,16 @@ else
3030
else
3131
gem 'rails', ENV['RAILS_VERSION']
3232
end
33-
end
3433

35-
case ENV['RAILS_VERSION']
36-
when /^5.[12]/, /^6.0/
37-
gem 'sass-rails', '~> 5.0'
34+
case ENV['RAILS_VERSION']
35+
when /^6.0/
36+
gem 'sass-rails', '>= 6'
37+
gem 'webpacker', '~> 4.0'
38+
when /^5.[12]/
39+
gem 'sass-rails', '~> 5.0'
40+
gem 'sprockets', '~> 3.7'
41+
gem 'thor', '~> 0.20'
42+
end
3843
end
3944
end
4045
# END ENGINE_CART BLOCK

0 commit comments

Comments
 (0)