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.

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

Add testing for rails 7.1 and 7.2 and ruby 3.3 #76

Merged
merged 3 commits into from
Oct 2, 2024
Merged

Add testing for rails 7.1 and 7.2 and ruby 3.3 #76

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
6cdb736
Add testing for rails 7.1 and 7.2 and ruby 3.3; drop testing of end o…
cjcolvar Sep 30, 2024
36f5b6e
Workaround zeitwerk and engine_cart issue
cjcolvar Oct 2, 2024
5767f91
Pin to blacklight less than 8.0
cjcolvar Oct 2, 2024
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
196 changes: 68 additions & 128 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,75 +57,45 @@ jobs:
workflows:
ci:
jobs:
# Rails 7.2
- test:
name: "ruby3-3_rails7-2"
ruby_version: 3.3.5
rails_version: 7.2.1
- test:
name: "ruby3-2_rails7-2"
ruby_version: 3.2.5
rails_version: 7.2.1
- test:
name: "ruby3-1_rails7-2"
ruby_version: 3.1.6
rails_version: 7.2.1
# Rails 7.1
- test:
name: "ruby3-3_rails7-1"
ruby_version: 3.3.5
rails_version: 7.1.4
- test:
name: "ruby3-2_rails7-1"
ruby_version: 3.2.5
rails_version: 7.1.4
- test:
name: "ruby3-1_rails7-1"
ruby_version: 3.1.6
rails_version: 7.1.4
# Rails 7.0
- test:
name: "ruby3-3_rails7-0"
ruby_version: 3.3.5
rails_version: 7.0.8.4
- test:
name: "ruby3-2_rails7-0"
ruby_version: 3.2.0
rails_version: 7.0.4.1
ruby_version: 3.2.5
rails_version: 7.0.8.4
- test:
name: "ruby3-1_rails7-0"
ruby_version: 3.1.3
rails_version: 7.0.4.1
- test:
name: "ruby3-0_rails7-0"
ruby_version: 3.0.5
rails_version: 7.0.4.1
# Rails 6.1
- test:
name: "ruby3-2_rails6-1"
ruby_version: 3.2.0
rails_version: 6.1.7.1
- test:
name: "ruby3-1_rails6-1"
ruby_version: 3.1.3
rails_version: 6.1.7.1
- test:
name: "ruby3-0_rails6-1"
ruby_version: 3.0.5
rails_version: 6.1.7.1
- test:
name: "ruby2-7_rails6-1"
ruby_version: 2.7.7
rails_version: 6.1.7.1
# Rails 6.0
- test:
name: "ruby3-2_rails6-0"
ruby_version: 3.2.0
rails_version: 6.0.6.1
- test:
name: "ruby3-1_rails6-0"
ruby_version: 3.1.3
rails_version: 6.0.6.1
- test:
name: "ruby3-0_rails6-0"
ruby_version: 3.0.5
rails_version: 6.0.6.1
- test:
name: "ruby2-7_rails6-0"
ruby_version: 2.7.7
rails_version: 6.0.6.1
- test:
name: "ruby2-6_rails6-0"
ruby_version: 2.6.10
rails_version: 6.0.6.1
# Rails 5.2
- test:
name: "ruby2-7_rails5-2"
ruby_version: 2.7.7
rails_version: 5.2.8.1
- test:
name: "ruby2-6_rails5-2"
ruby_version: 2.6.10
rails_version: 5.2.8.1
# Rails 5.1
- test:
name: "ruby2-7_rails5-1"
ruby_version: 2.7.7
rails_version: 5.1.7
- test:
name: "ruby2-6_rails5-1"
ruby_version: 2.6.10
rails_version: 5.1.7
ruby_version: 3.1.6
rails_version: 7.0.8.4

nightly:
triggers:
Expand All @@ -137,72 +107,42 @@ workflows:
- main

jobs:
# Rails 7.2
- test:
name: "ruby3-3_rails7-2"
ruby_version: 3.3.5
rails_version: 7.2.1
- test:
name: "ruby3-2_rails7-2"
ruby_version: 3.2.5
rails_version: 7.2.1
- test:
name: "ruby3-1_rails7-2"
ruby_version: 3.1.6
rails_version: 7.2.1
# Rails 7.1
- test:
name: "ruby3-3_rails7-1"
ruby_version: 3.3.5
rails_version: 7.1.4
- test:
name: "ruby3-2_rails7-1"
ruby_version: 3.2.5
rails_version: 7.1.4
- test:
name: "ruby3-1_rails7-1"
ruby_version: 3.1.6
rails_version: 7.1.4
# Rails 7.0
- test:
name: "ruby3-3_rails7-0"
ruby_version: 3.3.5
rails_version: 7.0.8.4
- test:
name: "ruby3-2_rails7-0"
ruby_version: 3.2.0
rails_version: 7.0.4.1
ruby_version: 3.2.5
rails_version: 7.0.8.4
- test:
name: "ruby3-1_rails7-0"
ruby_version: 3.1.3
rails_version: 7.0.4.1
- test:
name: "ruby3-0_rails7-0"
ruby_version: 3.0.5
rails_version: 7.0.4.1
# Rails 6.1
- test:
name: "ruby3-2_rails6-1"
ruby_version: 3.2.0
rails_version: 6.1.7.1
- test:
name: "ruby3-1_rails6-1"
ruby_version: 3.1.3
rails_version: 6.1.7.1
- test:
name: "ruby3-0_rails6-1"
ruby_version: 3.0.5
rails_version: 6.1.7.1
- test:
name: "ruby2-7_rails6-1"
ruby_version: 2.7.7
rails_version: 6.1.7.1
# Rails 6.0
- test:
name: "ruby3-2_rails6-0"
ruby_version: 3.2.0
rails_version: 6.0.6.1
- test:
name: "ruby3-1_rails6-0"
ruby_version: 3.1.3
rails_version: 6.0.6.1
- test:
name: "ruby3-0_rails6-0"
ruby_version: 3.0.5
rails_version: 6.0.6.1
- test:
name: "ruby2-7_rails6-0"
ruby_version: 2.7.7
rails_version: 6.0.6.1
- test:
name: "ruby2-6_rails6-0"
ruby_version: 2.6.10
rails_version: 6.0.6.1
# Rails 5.2
- test:
name: "ruby2-7_rails5-2"
ruby_version: 2.7.7
rails_version: 5.2.8.1
- test:
name: "ruby2-6_rails5-2"
ruby_version: 2.6.10
rails_version: 5.2.8.1
# Rails 5.1
- test:
name: "ruby2-7_rails5-1"
ruby_version: 2.7.7
rails_version: 5.1.7
- test:
name: "ruby2-6_rails5-1"
ruby_version: 2.6.10
rails_version: 5.1.7
ruby_version: 3.1.6
rails_version: 7.0.8.4
2 changes: 1 addition & 1 deletion hydra-role-management.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
gem.license = 'Apache 2.0'
gem.metadata = { "rubygems_mfa_required" => "true" }

gem.add_dependency 'blacklight'
gem.add_dependency 'blacklight', '< 8'
gem.add_dependency 'bootstrap_form'
gem.add_dependency 'bundler', '>= 1.5'
gem.add_dependency 'cancancan'
Expand Down
12 changes: 12 additions & 0 deletions lib/hydra/role_management.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,18 @@ class Engine < ::Rails::Engine
# Rails 4 should do this automatically:
config.paths.add 'app/controllers/concerns', eager_load: true
config.paths.add 'app/models/concerns', eager_load: true

config.before_configuration do
# rubocop:disable Style/IfUnlessModifier
# see https://github.com/fxn/zeitwerk#for_gem
# Blacklight puts a generator into LOCAL APP lib/generators, so tell
# zeitwerk to ignore the whole directory? If we're using zeitwerk
#
# See: https://github.com/cbeer/engine_cart/issues/117
if ::Rails.try(:autoloaders).try(:main).respond_to?(:ignore)
::Rails.autoloaders.main.ignore(::Rails.root.join('lib', 'generators'))
end
end
end
end
end