diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0ea845026..14b578d7e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -175,6 +175,9 @@ jobs: - rails: "6.1 (default)" gemfile: Gemfile experimental: false + - rails: "7.0" + gemfile: gemfiles/rails_7_0.gemfile + experimental: true - rails: "7.1" gemfile: gemfiles/rails_7_1.gemfile experimental: true diff --git a/core/lib/workarea/configuration/sidekiq.rb b/core/lib/workarea/configuration/sidekiq.rb index 836226721..6137b10b4 100644 --- a/core/lib/workarea/configuration/sidekiq.rb +++ b/core/lib/workarea/configuration/sidekiq.rb @@ -91,6 +91,7 @@ def configure_plugins! end end + require 'sidekiq/callbacks' unless defined?(::Sidekiq::Callbacks) ::Sidekiq::Callbacks.assert_valid_config! # sidekiq-throttled 1.x automatically installs its server middleware when # `sidekiq/throttled` is required; the old `.setup!` hook was removed. diff --git a/core/lib/workarea/core/engine.rb b/core/lib/workarea/core/engine.rb index 1dbe44cee..958fe9412 100644 --- a/core/lib/workarea/core/engine.rb +++ b/core/lib/workarea/core/engine.rb @@ -30,7 +30,7 @@ class Engine < ::Rails::Engine # doesn't rely on boolean return values from `sadd`, so opt into the # Redis 5 behavior now to eliminate deprecation warnings. require 'redis' - Redis.sadd_returns_boolean = false + Redis.sadd_returns_boolean = false if Redis.respond_to?(:sadd_returns_boolean=) Configuration::Sidekiq.load Configuration::CacheStore.load diff --git a/gemfiles/rails_7_0.gemfile b/gemfiles/rails_7_0.gemfile new file mode 100644 index 000000000..c2481b4aa --- /dev/null +++ b/gemfiles/rails_7_0.gemfile @@ -0,0 +1,5 @@ +# frozen_string_literal: true + +eval_gemfile File.expand_path('../Gemfile', __dir__) + +gem 'rails', '7.0.10'