diff --git a/.ruby-version b/.ruby-version index 6a81b4c837..818bd47abf 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.7.8 +3.0.6 diff --git a/Dockerfile b/Dockerfile index a9d5fcf28a..1b91ca41fe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:2.7.8-slim +FROM ruby:3.0.6-slim # Install dependencies RUN \ diff --git a/Gemfile.lock b/Gemfile.lock index 7b886e797a..e099c3089c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -505,7 +505,7 @@ GEM omniauth-rails_csrf_protection (1.0.1) actionpack (>= 4.2) omniauth (~> 2.0) - pagy (3.14.0) + pagy (4.11.0) parallel (1.24.0) parallel_tests (2.32.0) parallel @@ -803,7 +803,7 @@ DEPENDENCIES webmock RUBY VERSION - ruby 2.7.8p225 + ruby 3.0.6p216 BUNDLED WITH 2.4.22 diff --git a/lib/samson/hooks.rb b/lib/samson/hooks.rb index 0a51174fc7..adbbc4dbe3 100644 --- a/lib/samson/hooks.rb +++ b/lib/samson/hooks.rb @@ -178,8 +178,8 @@ def only_callbacks_for_plugin(plugin_name, hook_name) end # use - def fire(name, *args) - traced(name) { hooks(name).map { |hook| hook.call(*args) } } + def fire(name, *args, **kwargs) + traced(name) { hooks(name).map { |hook| hook.call(*args, **kwargs) } } end def render_views(name, view, *args) diff --git a/plugins/env/lib/samson_env/samson_plugin.rb b/plugins/env/lib/samson_env/samson_plugin.rb index 99f430da8e..d97f5f7027 100644 --- a/plugins/env/lib/samson_env/samson_plugin.rb +++ b/plugins/env/lib/samson_env/samson_plugin.rb @@ -77,8 +77,8 @@ def write_dotenv(base_file, groups) end # TODO: use for write_env_files -Samson::Hooks.callback :deploy_env do |*args| - EnvironmentVariable.env(*args) +Samson::Hooks.callback :deploy_env do |*args, **kwargs| + EnvironmentVariable.env(*args, **kwargs) end Samson::Hooks.callback(:link_parts_for_resource) do