diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index 6aedabf4c..7d53766ab 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -14,6 +14,7 @@ jobs: matrix: rails_version: [8.0.1] ruby: ["3.4"] + bundler_version: ["2.7.2"] additional_engine_cart_rails_options: [""] additional_name: [""] include: @@ -21,20 +22,17 @@ jobs: rails_version: 7.2.2.1 - ruby: "3.2" rails_version: 7.1.5.1 - - ruby: "3.4" - rails_version: "8.0.1" - blacklight_version: 9.0.0.beta1 - additional_name: "/ Blacklight 9" env: RAILS_VERSION: ${{ matrix.rails_version }} ENGINE_CART_RAILS_OPTIONS: "--skip-git --skip-listen --skip-spring --skip-keeps --skip-kamal --skip-solid --skip-coffee --skip-test --css bootstrap -a propshaft -j importmap ${{ matrix.additional_engine_cart_rails_options }}" BLACKLIGHT_VERSION: ${{ matrix.blacklight_version }} + BUNDLER_VERSION: ${{ matrix.bundler_version || '2.7.2' }} steps: - uses: actions/checkout@v4 - name: Set up Ruby ${{ matrix.ruby }} uses: ruby/setup-ruby@v1 with: - bundler: latest + bundler: ${{ matrix.bundler_version || '2.7.2' }} ruby-version: ${{ matrix.ruby }} - name: Install dependencies with Rails ${{ matrix.rails_version }} run: bundle install @@ -48,7 +46,7 @@ jobs: - name: Install Ruby and gems uses: ruby/setup-ruby@v1 with: - bundler: latest + bundler: ${{ matrix.bundler_version || '2.7.2' }} ruby-version: 3.2 - name: Install dependencies with Bundler run: bundle install diff --git a/Gemfile b/Gemfile index 7ba56d256..dd4a375e0 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ source 'https://rubygems.org' # Specify your gem's dependencies in arclight.gemspec -gemspec +gemspec path: File.expand_path(__dir__) # BEGIN ENGINE_CART BLOCK # engine_cart: 2.5.0 diff --git a/app/helpers/arclight/ead_format_helpers.rb b/app/helpers/arclight/ead_format_helpers.rb index 9511c2545..2ca1bae30 100644 --- a/app/helpers/arclight/ead_format_helpers.rb +++ b/app/helpers/arclight/ead_format_helpers.rb @@ -258,7 +258,7 @@ def format_indexes(node) index_head = node.at_css('head') index_head&.name = 'h3' index_head&.add_class('index-head') - index_head['id'] = ['index-', index_head.text].join.parameterize if index_head.present? + index_head.presence&.[]=('id', ['index-', index_head.text].join.parameterize) format_indexentries(node) node.name = 'div' end diff --git a/arclight.gemspec b/arclight.gemspec index 7fff58ad3..31abe11be 100644 --- a/arclight.gemspec +++ b/arclight.gemspec @@ -24,7 +24,7 @@ Gem::Specification.new do |spec| spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) } spec.require_paths = ['lib'] - spec.add_dependency 'blacklight', '>= 8.0.0', '< 10' + spec.add_dependency 'blacklight', '>= 8.0.0', '< 9' spec.add_dependency 'gretel' spec.add_dependency 'rails', '>= 7.1', '< 9' spec.add_dependency 'traject', '~> 3.0' diff --git a/spec/test_app_templates/lib/generators/test_app_generator.rb b/spec/test_app_templates/lib/generators/test_app_generator.rb index 8d5cca0d5..a3b84f69e 100644 --- a/spec/test_app_templates/lib/generators/test_app_generator.rb +++ b/spec/test_app_templates/lib/generators/test_app_generator.rb @@ -11,7 +11,7 @@ class TestAppGenerator < Rails::Generators::Base # after setting up the application def add_gems - Bundler.with_clean_env do + Bundler.with_unbundled_env do run 'bundle install' end end