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
3 changes: 3 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ jobs:
- alchemy_cms: "8.0"
rails: "8.0"
ruby: "3.4"
- alchemy_cms: "8.1"
rails: "8.1"
ruby: "3.4"
env:
RAILS_VERSION: ${{ matrix.rails }}
ALCHEMY_CMS_VERSION: ${{ matrix.alchemy_cms }}
Expand Down
9 changes: 6 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,13 @@ gem "puma"
gem "sqlite3"

alchemy_cms_version = ENV.fetch("ALCHEMY_CMS_VERSION", "8.0")
if alchemy_cms_version == "8.0"
gem "alchemy_cms", github: "AlchemyCMS/alchemy_cms", branch: "8.0-stable"
gem "alchemy-devise", github: "AlchemyCMS/alchemy-devise", branch: "main"
if alchemy_cms_version.start_with?("8.")
gem "propshaft"
end

if alchemy_cms_version == "8.1"
gem "alchemy_cms", github: "AlchemyCMS/alchemy_cms", branch: "8.1-stable"
gem "alchemy-devise", github: "AlchemyCMS/alchemy-devise", branch: "main"
else
gem "alchemy_cms", "~> #{alchemy_cms_version}"
gem "alchemy-devise", "~> #{alchemy_cms_version}"
Expand Down
4 changes: 2 additions & 2 deletions alchemy-solid_errors.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ Gem::Specification.new do |spec|
Dir["{app,config,db,lib}/**/*", "LICENSE", "Rakefile", "README.md"]
end

spec.add_dependency "rails", ">= 7.2.0", "< 8.1"
spec.add_dependency "alchemy_cms", ">= 7.4.0", "< 8.1"
spec.add_dependency "rails", ">= 7.2.0", "< 9.0"
spec.add_dependency "alchemy_cms", ">= 7.4.0", "< 8.2"
spec.add_dependency "solid_errors", ">= 0.7", "< 1.0"

spec.add_development_dependency "capybara", ["~> 3.0"]
Expand Down
2 changes: 1 addition & 1 deletion spec/dummy/config/initializers/devise.rb
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@
# ==> Configuration for :timeoutable
# The time you want to timeout the user session without activity. After this
# time the user will be asked for credentials again. Default is 30 minutes.
config.timeout_in = Rails.env.development? ? nil : Alchemy::Config.get(:auto_logout_time).minutes
config.timeout_in = Rails.env.development? ? nil : alchemy_config.get(:auto_logout_time).minutes

# ==> Configuration for :lockable
# Defines which strategy will be used to lock an account.
Expand Down