Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 11 additions & 15 deletions .github/workflows/ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v6
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
Expand All @@ -28,29 +28,25 @@ jobs:
continue-on-error: ${{ matrix.experimental }}
strategy:
matrix:
ruby: [2.7, '3.0']
rails_version: ['6.1.7', '7.0.4']
blacklight_version: ['~> 7.0']
ruby: ['3.2', '3.3', '3.4']
rails_version: ['~> 7.2', '~> 8.1']
blacklight_version: ['~> 8.0']
experimental: [false]
include:
- ruby: '3.1'
rails_version: '7.0.4'
blacklight_version: '~> 7.0'
- ruby: '3.4'
rails_version: '~> 8.1'
blacklight_version: '~> 9.0'
experimental: false
- ruby: '3.1'
rails_version: '7.0.4'
blacklight_version: '8.0.0.beta1'
experimental: false
- ruby: '3.1'
rails_version: '7.0.4'
- ruby: '3.4'
rails_version: '~> 8.1'
blacklight_version: 'github'
experimental: true
env:
RAILS_VERSION: ${{ matrix.rails_version }}
BLACKLIGHT_VERSION: ${{ matrix.blacklight_version }}
ENGINE_CART_RAILS_OPTIONS: '--skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-coffee --skip-test'
ENGINE_CART_RAILS_OPTIONS: '--skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-coffee --skip-test --skip-kamal --css=bootstrap --js=esbuild'
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v6
- name: Set up Ruby ${{ matrix.ruby }}
uses: ruby/setup-ruby@v1
with:
Expand Down
2 changes: 2 additions & 0 deletions .solr_wrapper.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@
collection:
dir: solr/conf/
name: blacklight-core
env:
SOLR_OPTS: '-Dsolr.config.lib.enabled=true'
4 changes: 2 additions & 2 deletions blacklight_advanced_search.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ Gem::Specification.new do |s|
s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
s.require_paths = ["lib"]

s.add_dependency 'blacklight', '>= 7.15', '< 9'
s.add_dependency 'blacklight', '>= 7.15', '< 10'
s.add_dependency "parslet"

s.add_development_dependency "rails"
s.add_development_dependency "rspec-rails", "~> 5.0"
s.add_development_dependency "rspec-rails", "~> 8.0"
s.add_development_dependency "capybara"
s.add_development_dependency 'solr_wrapper'
s.add_development_dependency 'engine_cart', "~> 2.0"
Expand Down