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

Jump to bottom

Bump Ruby from 2.7.8 to 3.0.6 #4094

Merged
merged 3 commits into from
Feb 12, 2024
Merged

Bump Ruby from 2.7.8 to 3.0.6 #4094

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
14e8e1c
Bump Ruby from 2.7.8 to 3.0.6
orien Feb 7, 2024
3e5c1e9
Bump pagy from 3.14.0 to 4.11.0
orien Feb 11, 2024
0cb8914
Samson Hooks uses kwargs for Ruby 3 compatibility
orien Feb 11, 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
2 changes: 1 addition & 1 deletion .ruby-version
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading