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

Add full Ruby 3.4 compatibility (non-breaking) #537

Merged
merged 1 commit into from
Jan 8, 2025
Merged

Add full Ruby 3.4 compatibility (non-breaking) #537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion .github/workflows/generator.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
ruby: ['2.7', '3.0', '3.1', '3.2', '3.3']
ruby: ['2.7', '3.0', '3.1', '3.2', '3.3', '3.4']
gemfile:
- gemfiles/Gemfile-rails.6.0.x
- gemfiles/Gemfile-rails.6.1.x
Expand All @@ -41,6 +41,12 @@ jobs:
gemfile: gemfiles/Gemfile-rails.6.0.x
- ruby: '3.3'
gemfile: gemfiles/Gemfile-rails.6.1.x
- ruby: '3.4'
gemfile: gemfiles/Gemfile-rails.6.0.x
- ruby: '3.4'
gemfile: gemfiles/Gemfile-rails.6.1.x
- ruby: '3.4'
gemfile: gemfiles/Gemfile-rails.7.0.x

env:
BUNDLE_GEMFILE: ${{ matrix.gemfile }}
Expand Down
10 changes: 8 additions & 2 deletions .github/workflows/ruby.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
run: rm -f Gemfile.lock
- uses: ruby/setup-ruby@v1
with:
ruby-version: '3.3'
ruby-version: '3.4'
rubygems: latest
bundler-cache: true

Expand All @@ -36,7 +36,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
ruby: ['2.7', '3.0', '3.1', '3.2', '3.3']
ruby: ['2.7', '3.0', '3.1', '3.2', '3.3', '3.4']
gemfile:
- gemfiles/Gemfile-rails.6.0.x
- gemfiles/Gemfile-rails.6.1.x
Expand All @@ -59,6 +59,12 @@ jobs:
gemfile: gemfiles/Gemfile-rails.6.0.x
- ruby: '3.3'
gemfile: gemfiles/Gemfile-rails.6.1.x
- ruby: '3.4'
gemfile: gemfiles/Gemfile-rails.6.0.x
- ruby: '3.4'
gemfile: gemfiles/Gemfile-rails.6.1.x
- ruby: '3.4'
gemfile: gemfiles/Gemfile-rails.7.0.x

env:
BUNDLE_GEMFILE: ${{ matrix.gemfile }}
Expand Down
2 changes: 1 addition & 1 deletion lib/shakapacker/helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ def prepend_javascript_pack_tag(*names, defer: true)

def update_javascript_pack_tag_queue(defer:)
if @javascript_pack_tag_loaded
raise "You can only call #{caller_locations(1..1).first.label} before javascript_pack_tag helper. " \
raise "You can only call #{caller_locations(1..1).first.base_label} before javascript_pack_tag helper. " \
"Please refer to https://github.com/shakacode/shakapacker/blob/main/README.md#view-helper-append_javascript_pack_tag-prepend_javascript_pack_tag-and-append_stylesheet_pack_tag for the usage guide"
end

Expand Down
Loading