Skip to content

[backport 8.x] Fix CI via updating versions of Rails tested & Solr 9.8 fix #3500

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 29, 2025
Merged

[backport 8.x] Fix CI via updating versions of Rails tested & Solr 9.8 fix #3500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e7bd1b0
Use SOLR_MODULES envvar, rather than solrconfig <lib> entries for Sol…
sandbergja Jan 23, 2025
7ab3b94
Test with esbuild/propshaft including both Rails 7.2 and 8.0
jrochkind Oct 14, 2024
7f3e82f
Update versions of Rails tested in CI
seanaery Jan 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 17 additions & 10 deletions .github/workflows/ruby.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,43 +34,50 @@ jobs:
runs-on: ubuntu-latest
name: test (ruby ${{ matrix.ruby }} / rails ${{ matrix.rails_version }} ${{ matrix.additional_name }})
strategy:
fail-fast: false
matrix:
ruby: ["3.3"]
rails_version: ["7.1.3.4", "7.2.0"]
rails_version: ["7.1.5.1", "7.2.2.1"]
bootstrap_version: [null]
view_component_version: ["~> 3.12"]
api: [null]
additional_engine_cart_rails_options: [""]
additional_name: [""]
include:
- ruby: "3.3"
rails_version: "8.0.0"
rails_version: "8.0.1"
additional_engine_cart_rails_options: --css=bootstrap
- ruby: "3.3"
rails_version: "8.0.1"
additional_engine_cart_rails_options: --css=bootstrap --js=esbuild
additional_name: "/ esbuild"
- ruby: "3.2"
rails_version: "6.1.7.8"
- ruby: "3.2"
rails_version: "7.1.3.4"
rails_version: "7.1.5.1"
solr_version: "8.11.2"
additional_name: "Solr 8.11.2"
- ruby: "3.1"
rails_version: "7.1.3.4"
rails_version: "7.1.5.1"
- ruby: "3.1"
rails_version: "7.1.3.4"
rails_version: "7.1.5.1"
view_component_version: "~> 2.74"
additional_name: "/ ViewComponent 2"
- ruby: "3.1"
rails_version: "7.1.3.4"
rails_version: "7.1.5.1"
additional_name: "/ Propshaft"
additional_engine_cart_rails_options: -a propshaft --css=bootstrap
- ruby: "3.1"
rails_version: "7.1.3.4"
rails_version: "7.1.5.1"
bootstrap_version: "~> 4.0"
additional_name: "/ Bootstrap 4"
- ruby: "3.3"
rails_version: "7.1.3.4"
rails_version: "7.1.5.1"
api: "true"
additional_engine_cart_rails_options: --api --skip-yarn
additional_name: "/ API"
- ruby: "3.3"
rails_version: "7.2.2.1"
additional_engine_cart_rails_options: -a propshaft --css=bootstrap --js=esbuild
additional_name: "/ Propshaft, esbuild"
env:
RAILS_VERSION: ${{ matrix.rails_version }}
SOLR_VERSION: ${{ matrix.solr_version || 'latest' }}
Expand Down
1 change: 1 addition & 0 deletions compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ services:
environment:
- SOLR_PORT # Set via environment variable or use default defined in .env file
- SOLR_VERSION # Set via environment variable or use default defined in .env file
- SOLR_MODULES=analysis-extras
image: "solr:${SOLR_VERSION}"
volumes:
- $PWD/lib/generators/blacklight/templates/solr/conf:/opt/solr/conf
Expand Down
2 changes: 1 addition & 1 deletion lib/generators/blacklight/templates/solr/conf/solrconfig.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</updateLog>
</updateHandler>

<!-- solr lib dirs -->
<!-- solr lib dirs, which are needed for Solr 8 compatibility but ignored in solr 9.8 and above -->
<lib dir="${solr.install.dir:../../../..}/modules/analysis-extras/lib" />
<lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lib" />
<lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lucene-libs" />
Expand Down