Skip to content
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.

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

Add Rails 7.1 to the test matrix #2999

Merged
merged 5 commits into from
Jul 1, 2024
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
6 changes: 5 additions & 1 deletion .github/workflows/ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,15 @@ jobs:
blacklight_version: 'latest'
bootstrap_version: ~> 4.0
additional_engine_cart_rails_options: -a propshaft
- rails_version: '7.1.3.4'
ruby: '3.2'
blacklight_version: '8.0.0'
bootstrap_version: ~> 4.0
env:
RAILS_VERSION: ${{ matrix.rails_version }}
BLACKLIGHT_VERSION: ${{ matrix.blacklight_version }}
BOOTSTRAP_VERSION: ${{ matrix.bootstrap_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-coffee --skip-test
steps:
- uses: actions/checkout@v4
- name: Set up Ruby ${{ matrix.ruby }}
Expand Down
2 changes: 1 addition & 1 deletion blacklight-spotlight.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ these collections.)
s.add_dependency 'openseadragon'
s.add_dependency 'ostruct', '!= 0.3.0', '!= 0.3.1', '!= 0.3.2'
s.add_dependency 'paper_trail', '>= 11.0', '< 16'
s.add_dependency 'rails', '>= 6.1', '< 7.1'
s.add_dependency 'rails', '>= 6.1', '< 7.2'
s.add_dependency 'redcarpet', '>= 2.0.1', '< 4'
s.add_dependency 'riiif', '~> 2.0'
s.add_dependency 'roar', '~> 1.1'
Expand Down
18 changes: 7 additions & 11 deletions lib/generators/spotlight/install_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -152,24 +152,20 @@ def add_mailer_defaults
end
end

def generate_config
directory 'config'
end

def add_solr_config_resources
copy_file '.solr_wrapper.yml', '.solr_wrapper.yml'
directory 'solr'
end

def generate_devise_invitable
gem 'devise_invitable'
bundle_install
generate 'devise_invitable:install'
generate 'devise_invitable', 'User'
end

def add_translations
copy_file 'config/initializers/translation.rb'
def generate_config
directory 'config'
end

def add_solr_config_resources
copy_file '.solr_wrapper.yml', '.solr_wrapper.yml'
directory 'solr'
end

def configure_logging
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@
# Don't allow initializer to break if DB doesn't exist yet
# see: https://github.com/projectblacklight/spotlight/issues/2133
if ENV['SKIP_TRANSLATION'].blank?
raise unless Translation.table_exists?

unless Translation.table_exists?
warn "Translation table doesn't exist. Skipping translation config."
next
end
##
# Sets up the new Spotlight Translation backend, backed by ActiveRecord. To
# turn on the ActiveRecord backend, uncomment the following lines.
Expand Down