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

Test on Rails 8 #164

Merged
merged 3 commits into from
Dec 10, 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
16 changes: 11 additions & 5 deletions .github/workflows/ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
strategy:
matrix:
ruby: ["3.2", "3.3"]
rails_version: ["7.0.4"]
rails_version: ["7.2.2"]
blacklight_version: ["~> 7.0"]
experimental: [false]
additional_engine_cart_rails_options: [""]
Expand Down Expand Up @@ -42,12 +42,18 @@ jobs:
experimental: false
view_component_version: "~> 2.83"
additional_name: "/ ViewComponent 2"
- ruby: "3.2"
rails_version: "7.0.4"
- ruby: "3.3"
rails_version: "8.0.0"
blacklight_version: "~> 8.0"
experimental: false
additional_engine_cart_rails_options: --css bootstrap
additional_name: "/ Blackight 8 / Rails 8"
- ruby: "3.3"
rails_version: "7.2.2"
blacklight_version: "github"
experimental: true
additional_engine_cart_rails_options: -a propshaft
additional_name: "/ Propshaft"
additional_engine_cart_rails_options: -a propshaft --css bootstrap
additional_name: "/ Blacklight main branch with Propshaft"
env:
RAILS_VERSION: ${{ matrix.rails_version }}
BLACKLIGHT_VERSION: ${{ matrix.blacklight_version }}
Expand Down
2 changes: 1 addition & 1 deletion blacklight-gallery.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
spec.require_paths = ["lib"]

spec.add_dependency "rails", '>= 6.1', '< 8'
spec.add_dependency "rails", '>= 6.1', '< 9'
spec.add_dependency 'blacklight', '>= 7.17', '< 9'

spec.add_development_dependency "rake"
Expand Down
3 changes: 3 additions & 0 deletions lib/generators/blacklight_gallery/install_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ def add_openseadragon

def assets
copy_file "blacklight_gallery.css.scss", "app/assets/stylesheets/blacklight_gallery.css.scss"

return unless defined?(Sprockets)

append_to_file 'app/assets/config/manifest.js', "\n//= link blacklight_gallery/manifest.js\n"
copy_file "blacklight_gallery.js", "app/assets/javascripts/blacklight_gallery.js"

Expand Down
Loading