Skip to content

Commit

Permalink
Merge pull request #4094 from envato/ruby-3
Browse files Browse the repository at this point in the history
Bump Ruby from 2.7.8 to 3.0.6
  • Loading branch information
grosser authored Feb 12, 2024
2 parents 2573f04 + 0cb8914 commit 7b2c255
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.8
3.0.6
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:2.7.8-slim
FROM ruby:3.0.6-slim

# Install dependencies
RUN \
Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -803,7 +803,7 @@ DEPENDENCIES
webmock

RUBY VERSION
ruby 2.7.8p225
ruby 3.0.6p216

BUNDLED WITH
2.4.22
4 changes: 2 additions & 2 deletions lib/samson/hooks.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions plugins/env/lib/samson_env/samson_plugin.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 7b2c255

Please sign in to comment.