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

Feature/535 full ruby34 compatibility #4

Closed
wants to merge 2 commits into from
Closed

Feature/535 full ruby34 compatibility #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
17a976f
Fix generator specs
tagliala Dec 27, 2024
b99a6fa
Add full Ruby 3.4 compatibility
tagliala Dec 27, 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 .github/workflows/dummy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
node-version: '16'
- uses: ruby/setup-ruby@v1
with:
ruby-version: '3.1.2'
ruby-version: '3.1.6'
- name: Install dependencies
run: |
bundle install
Expand Down
15 changes: 14 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,29 +18,42 @@ 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
- gemfiles/Gemfile-rails.7.0.x
- gemfiles/Gemfile-rails.7.1.x
- gemfiles/Gemfile-rails.7.2.x
- gemfiles/Gemfile-rails.8.0.x
# Uncomment the following line only to ensure compatibility with the
# upcomming Rails versions, maybe before a release.
#- gemfiles/Gemfile-rails-edge
exclude:
- ruby: '2.7'
gemfile: gemfiles/Gemfile-rails.7.2.x
- ruby: '2.7'
gemfile: gemfiles/Gemfile-rails.8.0.x
- ruby: '3.0'
gemfile: gemfiles/Gemfile-rails.7.2.x
- ruby: '3.0'
gemfile: gemfiles/Gemfile-rails.8.0.x
- ruby: '3.1'
gemfile: gemfiles/Gemfile-rails.6.0.x
- ruby: '3.1'
gemfile: gemfiles/Gemfile-rails.8.0.x
- ruby: '3.2'
gemfile: gemfiles/Gemfile-rails.6.0.x
- ruby: '3.3'
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
4 changes: 2 additions & 2 deletions .github/workflows/node.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
persist-credentials: false
- uses: actions/setup-node@v4
with:
node-version: 20.x
node-version: 22.x
cache: yarn

- name: Install dependencies
Expand All @@ -35,7 +35,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
node: [14.x, 16.x, 18.x, 20.x]
node: [14.x, 16.x, 18.x, 20.x, 22.x]

runs-on: ${{ matrix.os }}

Expand Down
17 changes: 15 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'
bundler-cache: true

- name: Ruby rubocop
Expand All @@ -35,29 +35,42 @@ 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
- gemfiles/Gemfile-rails.7.0.x
- gemfiles/Gemfile-rails.7.1.x
- gemfiles/Gemfile-rails.7.2.x
- gemfiles/Gemfile-rails.8.0.x
# Uncomment the following line only to ensure compatibility with the
# upcomming Rails versions, maybe before a release.
#- gemfiles/Gemfile-rails-edge
exclude:
- ruby: '2.7'
gemfile: gemfiles/Gemfile-rails.7.2.x
- ruby: '2.7'
gemfile: gemfiles/Gemfile-rails.8.0.x
- ruby: '3.0'
gemfile: gemfiles/Gemfile-rails.7.2.x
- ruby: '3.0'
gemfile: gemfiles/Gemfile-rails.8.0.x
- ruby: '3.1'
gemfile: gemfiles/Gemfile-rails.6.0.x
- ruby: '3.1'
gemfile: gemfiles/Gemfile-rails.8.0.x
- ruby: '3.2'
gemfile: gemfiles/Gemfile-rails.6.0.x
- ruby: '3.3'
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 gemfiles/Gemfile-rails.6.0.x
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ gemspec path: "../"
gem "rails", "~> 6.0.0"
gem "rake", ">= 11.1"
gem "rack-proxy", require: false
gem "rspec-rails", "~> 5.0.0"
gem "rspec-rails", "~> 5.0"
gem "byebug"
2 changes: 1 addition & 1 deletion gemfiles/Gemfile-rails.6.1.x
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ gemspec path: "../"
gem "rails", '~>6.1.0'
gem "rake", ">= 11.1"
gem "rack-proxy", require: false
gem "rspec-rails", "~> 6.0.0"
gem "rspec-rails", "~> 6.1"
gem "byebug"
2 changes: 1 addition & 1 deletion gemfiles/Gemfile-rails.7.0.x
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ gemspec path: "../"
gem "rails", '~>7.0.0'
gem "rake", ">= 11.1"
gem "rack-proxy", require: false
gem "rspec-rails", "~> 6.0.0"
gem "rspec-rails", "~> 7.0"
gem "byebug"
2 changes: 1 addition & 1 deletion gemfiles/Gemfile-rails.7.1.x
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ gemspec path: "../"
gem "rails", '~>7.1.0'
gem "rake", ">= 11.1"
gem "rack-proxy", require: false
gem "rspec-rails", "~> 6.0.0"
gem "rspec-rails", "~> 7.0"
gem "byebug"
2 changes: 1 addition & 1 deletion gemfiles/Gemfile-rails.7.2.x
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ gemspec path: "../"
gem "rails", '~>7.2.0'
gem "rake", ">= 11.1"
gem "rack-proxy", require: false
gem "rspec-rails", "~> 6.0.0"
gem "rspec-rails", "~> 7.0"
gem "byebug"
11 changes: 11 additions & 0 deletions gemfiles/Gemfile-rails.8.0.x
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
source "https://rubygems.org"

git_source(:github) { |repo| "https://github.com/#{repo}.git" }

gemspec path: "../"

gem "rails", '~>8.0.0'
gem "rake", ">= 11.1"
gem "rack-proxy", require: false
gem "rspec-rails", "~> 7.0"
gem "byebug"
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
11 changes: 10 additions & 1 deletion spec/generator_specs/generator_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,17 @@
bundle install
))
else
# TODO: remove when Ruby < 3.1 support will be dropped
# Ref: https://github.com/shakacode/shakapacker/issues/534
bundler_update_command =
if RUBY_VERSION.start_with?("3.1")
"gem update bundler"
else
"gem install bundler --version '< 2.6'"
end

sh_in_dir({}, BASE_RAILS_APP_PATH, %(
gem update bundler
#{bundler_update_command}
bundle add shakapacker --path "#{GEM_ROOT}"
))
end
Expand Down
Loading