Skip to content

Commit 75ed59f

Browse files
authored
Merge pull request #315 from projectblacklight/eol-rails-7.0-ruby-3.1
Stop testing on rails 7.0 & ruby 3.1; both EOL.
2 parents 636e841 + b3f2bae commit 75ed59f

File tree

1 file changed

+9
-17
lines changed

1 file changed

+9
-17
lines changed

.github/workflows/ruby.yml

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ jobs:
2424
#
2525
# * Blacklight: 7, 8, or 9
2626
# * Rails: 7 or 8
27-
# * sprockets or propshaft(with cssbundling-rails sass)
28-
# * importmap-rails or esbuild (each with sprockets or importmaps)
27+
# * sprockets or propshaft (with cssbundling-rails sass)
28+
# * importmap-rails or esbuild (each with sprockets or importmaps)
2929
#
3030
# We should work with almost every combo of these (even though BL itself
3131
# doesn't officially support every one), but we don't test with every one,
@@ -42,29 +42,30 @@ jobs:
4242
ruby: "3.3"
4343
additional_name: "/ importmap-rails"
4444
additional_engine_cart_rails_options: "--css=bootstrap"
45+
4546
- rails_version: "~> 8.0.0"
4647
blacklight_version: '{ "git": "https://github.com/projectblacklight/blacklight.git" }'
4748
ruby: "3.3"
4849
additional_name: "/ esbuild"
4950
additional_engine_cart_rails_options: "--css=bootstrap --javascript=esbuild"
5051

51-
52-
5352
# BLACKLIGHT 8, can test with use importmaps and esbuild
5453
#
5554

5655
- rails_version: "7.2.1"
5756
blacklight_version: "~> 8.0"
5857
ruby: "3.3"
5958
additional_name: "/ importmap-rails, sprockets"
59+
6060
- rails_version: "7.2.1"
6161
blacklight_version: "~> 8.0"
6262
ruby: "3.3"
6363
additional_name: "/ importmap-rails, propshaft"
6464
additional_engine_cart_rails_options: "-a propshaft --css=bootstrap"
65+
6566
- rails_version: "7.2.1"
6667
blacklight_version: "~> 8.0"
67-
ruby: 3.3
68+
ruby: "3.3"
6869
additional_engine_cart_rails_options: "-a propshaft --javascript=esbuild --css=bootstrap"
6970
additional_name: "/ esbuild, propshaft"
7071

@@ -73,19 +74,19 @@ jobs:
7374
# * Blacklight 8 can't easily generate an app with Rails 7 and sprockets and esbuild
7475
# (the default layout won't be right), although I think it should work fine.
7576
#
76-
# * Can't test with unreleaed Blacklight main and esbuild because the blacklight-frontend
77-
# npm package doens't work from git checkout. So currently can't test with Rails8
77+
# * Can't test with unreleased Blacklight main and esbuild because the blacklight-frontend
78+
# npm package doesn't work from git checkout. So currently can't test with Rails 8
7879
# and esbuild.
7980

8081

81-
8282
# BLACKLIGHT 7, only test with esbuild, not sure if it supports importmaps, it won't generate it
8383

8484
- rails_version: "7.2.1"
8585
blacklight_version: "~> 7.0"
8686
ruby: "3.3"
8787
additional_engine_cart_rails_options: "--javascript=esbuild"
8888
additional_name: "/ esbuild, sprockets"
89+
8990
- rails_version: "7.2.1"
9091
blacklight_version: "~> 7.0"
9192
ruby: "3.3"
@@ -98,15 +99,6 @@ jobs:
9899
additional_engine_cart_rails_options: "--javascript=esbuild"
99100
additional_name: "/ esbuild, sprockets"
100101

101-
- rails_version: "7.0.8.4"
102-
blacklight_version: "~> 7.0"
103-
ruby: "3.1"
104-
additional_engine_cart_rails_options: "--javascript=esbuild"
105-
additional_name: "/ esbuild, sprockets"
106-
107-
108-
109-
110102

111103
env:
112104
BLACKLIGHT_VERSION: ${{ matrix.blacklight_version || '~> 8.0' }}

0 commit comments

Comments
 (0)