From 48e6058e2f9e25ee298d9bbdb686fa1bab028dff Mon Sep 17 00:00:00 2001 From: Geremia Taglialatela Date: Sun, 1 Sep 2024 11:01:10 +0200 Subject: [PATCH 1/4] Test against Rails 7.2 --- .github/workflows/generator.yml | 5 +++++ .github/workflows/ruby.yml | 5 +++++ gemfiles/Gemfile-rails.7.2.x | 12 ++++++++++++ 3 files changed, 22 insertions(+) create mode 100644 gemfiles/Gemfile-rails.7.2.x diff --git a/.github/workflows/generator.yml b/.github/workflows/generator.yml index de08894cc..bcd3ed73f 100644 --- a/.github/workflows/generator.yml +++ b/.github/workflows/generator.yml @@ -24,10 +24,15 @@ jobs: - gemfiles/Gemfile-rails.6.1.x - gemfiles/Gemfile-rails.7.0.x - gemfiles/Gemfile-rails.7.1.x + - gemfiles/Gemfile-rails.7.2.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: '3.0' + gemfile: gemfiles/Gemfile-rails.7.2.x - ruby: '3.1' gemfile: gemfiles/Gemfile-rails.6.0.x - ruby: '3.2' diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index 59b4a66cb..f26aaaaec 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -41,10 +41,15 @@ jobs: - gemfiles/Gemfile-rails.6.1.x - gemfiles/Gemfile-rails.7.0.x - gemfiles/Gemfile-rails.7.1.x + - gemfiles/Gemfile-rails.7.2.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: '3.0' + gemfile: gemfiles/Gemfile-rails.7.2.x - ruby: '3.1' gemfile: gemfiles/Gemfile-rails.6.0.x - ruby: '3.2' diff --git a/gemfiles/Gemfile-rails.7.2.x b/gemfiles/Gemfile-rails.7.2.x new file mode 100644 index 000000000..6b1fce3c8 --- /dev/null +++ b/gemfiles/Gemfile-rails.7.2.x @@ -0,0 +1,12 @@ +source "https://rubygems.org" + +git_source(:github) { |repo| "https://github.com/#{repo}.git" } + +gemspec path: "../" + +gem "rails", '~>7.2.0' +gem "arel", github: "rails/arel" +gem "rake", ">= 11.1" +gem "rack-proxy", require: false +gem "rspec-rails", "~> 6.0.0" +gem "byebug" From 11987f1e534d0d444a24a4cfc8d0f840a5f99a86 Mon Sep 17 00:00:00 2001 From: Geremia Taglialatela Date: Sun, 1 Sep 2024 11:02:00 +0200 Subject: [PATCH 2/4] Update default gemfile --- Gemfile.lock | 168 +++++++++++++++++++++++++-------------------------- 1 file changed, 81 insertions(+), 87 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index bf36731b6..f14048fe4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -11,86 +11,82 @@ PATH GEM remote: https://rubygems.org/ specs: - actioncable (7.1.3.4) - actionpack (= 7.1.3.4) - activesupport (= 7.1.3.4) + actioncable (7.2.1) + actionpack (= 7.2.1) + activesupport (= 7.2.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) zeitwerk (~> 2.6) - actionmailbox (7.1.3.4) - actionpack (= 7.1.3.4) - activejob (= 7.1.3.4) - activerecord (= 7.1.3.4) - activestorage (= 7.1.3.4) - activesupport (= 7.1.3.4) - mail (>= 2.7.1) - net-imap - net-pop - net-smtp - actionmailer (7.1.3.4) - actionpack (= 7.1.3.4) - actionview (= 7.1.3.4) - activejob (= 7.1.3.4) - activesupport (= 7.1.3.4) - mail (~> 2.5, >= 2.5.4) - net-imap - net-pop - net-smtp + actionmailbox (7.2.1) + actionpack (= 7.2.1) + activejob (= 7.2.1) + activerecord (= 7.2.1) + activestorage (= 7.2.1) + activesupport (= 7.2.1) + mail (>= 2.8.0) + actionmailer (7.2.1) + actionpack (= 7.2.1) + actionview (= 7.2.1) + activejob (= 7.2.1) + activesupport (= 7.2.1) + mail (>= 2.8.0) rails-dom-testing (~> 2.2) - actionpack (7.1.3.4) - actionview (= 7.1.3.4) - activesupport (= 7.1.3.4) + actionpack (7.2.1) + actionview (= 7.2.1) + activesupport (= 7.2.1) nokogiri (>= 1.8.5) racc - rack (>= 2.2.4) + rack (>= 2.2.4, < 3.2) rack-session (>= 1.0.1) rack-test (>= 0.6.3) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - actiontext (7.1.3.4) - actionpack (= 7.1.3.4) - activerecord (= 7.1.3.4) - activestorage (= 7.1.3.4) - activesupport (= 7.1.3.4) + useragent (~> 0.16) + actiontext (7.2.1) + actionpack (= 7.2.1) + activerecord (= 7.2.1) + activestorage (= 7.2.1) + activesupport (= 7.2.1) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.1.3.4) - activesupport (= 7.1.3.4) + actionview (7.2.1) + activesupport (= 7.2.1) builder (~> 3.1) erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - activejob (7.1.3.4) - activesupport (= 7.1.3.4) + activejob (7.2.1) + activesupport (= 7.2.1) globalid (>= 0.3.6) - activemodel (7.1.3.4) - activesupport (= 7.1.3.4) - activerecord (7.1.3.4) - activemodel (= 7.1.3.4) - activesupport (= 7.1.3.4) + activemodel (7.2.1) + activesupport (= 7.2.1) + activerecord (7.2.1) + activemodel (= 7.2.1) + activesupport (= 7.2.1) timeout (>= 0.4.0) - activestorage (7.1.3.4) - actionpack (= 7.1.3.4) - activejob (= 7.1.3.4) - activerecord (= 7.1.3.4) - activesupport (= 7.1.3.4) + activestorage (7.2.1) + actionpack (= 7.2.1) + activejob (= 7.2.1) + activerecord (= 7.2.1) + activesupport (= 7.2.1) marcel (~> 1.0) - activesupport (7.1.3.4) + activesupport (7.2.1) base64 bigdecimal - concurrent-ruby (~> 1.0, >= 1.0.2) + concurrent-ruby (~> 1.0, >= 1.3.1) connection_pool (>= 2.2.5) drb i18n (>= 1.6, < 2) + logger (>= 1.4.2) minitest (>= 5.1) - mutex_m - tzinfo (~> 2.0) + securerandom (>= 0.3) + tzinfo (~> 2.0, >= 2.0.5) ast (2.4.2) base64 (0.2.0) bigdecimal (3.1.8) builder (3.3.0) byebug (11.1.3) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) connection_pool (2.4.1) crass (1.0.6) date (3.3.4) @@ -107,6 +103,7 @@ GEM reline (>= 0.4.2) json (2.7.2) language_server-protocol (3.17.0.3) + logger (1.6.0) loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) @@ -118,9 +115,8 @@ GEM marcel (1.0.4) mini_mime (1.1.5) mini_portile2 (2.8.7) - minitest (5.24.1) - mutex_m (0.2.0) - net-imap (0.4.14) + minitest (5.25.1) + net-imap (0.4.15) date net-protocol net-pop (0.1.2) @@ -130,18 +126,18 @@ GEM net-smtp (0.5.0) net-protocol nio4r (2.7.3) - nokogiri (1.16.6) + nokogiri (1.16.7) mini_portile2 (~> 2.8.2) racc (~> 1.4) package_json (0.1.0) - parallel (1.25.1) - parser (3.3.3.0) + parallel (1.26.3) + parser (3.3.4.2) ast (~> 2.4.1) racc psych (5.1.2) stringio - racc (1.8.0) - rack (3.1.6) + racc (1.8.1) + rack (3.1.7) rack-proxy (0.7.7) rack rack-session (2.0.0) @@ -151,20 +147,20 @@ GEM rackup (2.1.0) rack (>= 3) webrick (~> 1.8) - rails (7.1.3.4) - actioncable (= 7.1.3.4) - actionmailbox (= 7.1.3.4) - actionmailer (= 7.1.3.4) - actionpack (= 7.1.3.4) - actiontext (= 7.1.3.4) - actionview (= 7.1.3.4) - activejob (= 7.1.3.4) - activemodel (= 7.1.3.4) - activerecord (= 7.1.3.4) - activestorage (= 7.1.3.4) - activesupport (= 7.1.3.4) + rails (7.2.1) + actioncable (= 7.2.1) + actionmailbox (= 7.2.1) + actionmailer (= 7.2.1) + actionpack (= 7.2.1) + actiontext (= 7.2.1) + actionview (= 7.2.1) + activejob (= 7.2.1) + activemodel (= 7.2.1) + activerecord (= 7.2.1) + activestorage (= 7.2.1) + activesupport (= 7.2.1) bundler (>= 1.15.0) - railties (= 7.1.3.4) + railties (= 7.2.1) rails-dom-testing (2.2.0) activesupport (>= 5.0.0) minitest @@ -172,10 +168,10 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (7.1.3.4) - actionpack (= 7.1.3.4) - activesupport (= 7.1.3.4) - irb + railties (7.2.1) + actionpack (= 7.2.1) + activesupport (= 7.2.1) + irb (~> 1.13) rackup (>= 1.0.0) rake (>= 12.2) thor (~> 1.0, >= 1.2.2) @@ -187,11 +183,9 @@ GEM regexp_parser (2.9.2) reline (0.5.9) io-console (~> 0.5) - rexml (3.3.1) - strscan rspec-core (3.13.0) rspec-support (~> 3.13.0) - rspec-expectations (3.13.1) + rspec-expectations (3.13.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) rspec-mocks (3.13.1) @@ -206,36 +200,36 @@ GEM rspec-mocks (~> 3.12) rspec-support (~> 3.12) rspec-support (3.13.1) - rubocop (1.64.1) + rubocop (1.66.0) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8, < 3.0) - rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.31.1, < 2.0) + regexp_parser (>= 2.4, < 3.0) + rubocop-ast (>= 1.32.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.31.3) + rubocop-ast (1.32.1) parser (>= 3.3.1.0) rubocop-performance (1.21.1) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) ruby-progressbar (1.13.0) + securerandom (0.3.1) semantic_range (3.0.0) stringio (3.1.1) - strscan (3.1.0) - thor (1.3.1) + thor (1.3.2) timeout (0.4.1) tzinfo (2.0.6) concurrent-ruby (~> 1.0) unicode-display_width (2.5.0) + useragent (0.16.10) webrick (1.8.1) websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - zeitwerk (2.6.16) + zeitwerk (2.6.17) PLATFORMS ruby @@ -254,4 +248,4 @@ DEPENDENCIES shakapacker! BUNDLED WITH - 2.5.9 + 2.5.18 From 053ba7cae2f24b6a976eb9bf2374bea303c1a77b Mon Sep 17 00:00:00 2001 From: Geremia Taglialatela Date: Sun, 1 Sep 2024 11:16:03 +0200 Subject: [PATCH 3/4] Fix dummy app workflow --- spec/dummy/yarn.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/dummy/yarn.lock b/spec/dummy/yarn.lock index f6a8f33a7..8de2363ea 100644 --- a/spec/dummy/yarn.lock +++ b/spec/dummy/yarn.lock @@ -4060,7 +4060,7 @@ setprototypeof@1.2.0: integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw== "shakapacker@file:.yalc/shakapacker": - version "8.0.1" + version "8.0.2" dependencies: js-yaml "^4.1.0" path-complete-extname "^1.0.0" From fd80df072b22f836c44dfa9edef8811e0db93fca Mon Sep 17 00:00:00 2001 From: Geremia Taglialatela Date: Sun, 1 Sep 2024 11:23:08 +0200 Subject: [PATCH 4/4] Remove references to arel There should be no reason to get arel from `github` and the commit history is not clear. --- gemfiles/Gemfile-rails.6.0.x | 2 +- gemfiles/Gemfile-rails.6.1.x | 1 - gemfiles/Gemfile-rails.7.0.x | 1 - gemfiles/Gemfile-rails.7.1.x | 1 - gemfiles/Gemfile-rails.7.2.x | 1 - 5 files changed, 1 insertion(+), 5 deletions(-) diff --git a/gemfiles/Gemfile-rails.6.0.x b/gemfiles/Gemfile-rails.6.0.x index 7f8c64d29..1d4ea57b9 100644 --- a/gemfiles/Gemfile-rails.6.0.x +++ b/gemfiles/Gemfile-rails.6.0.x @@ -2,7 +2,7 @@ source "https://rubygems.org" gemspec path: "../" -gem "rails", "~> 6.0.0.rc2" +gem "rails", "~> 6.0.0" gem "rake", ">= 11.1" gem "rack-proxy", require: false gem "rspec-rails", "~> 5.0.0" diff --git a/gemfiles/Gemfile-rails.6.1.x b/gemfiles/Gemfile-rails.6.1.x index 04d5b103d..6be9f55b8 100644 --- a/gemfiles/Gemfile-rails.6.1.x +++ b/gemfiles/Gemfile-rails.6.1.x @@ -5,7 +5,6 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" } gemspec path: "../" gem "rails", '~>6.1.0' -gem "arel", github: "rails/arel" gem "rake", ">= 11.1" gem "rack-proxy", require: false gem "rspec-rails", "~> 6.0.0" diff --git a/gemfiles/Gemfile-rails.7.0.x b/gemfiles/Gemfile-rails.7.0.x index 5d4aebb5b..52ca5011e 100644 --- a/gemfiles/Gemfile-rails.7.0.x +++ b/gemfiles/Gemfile-rails.7.0.x @@ -5,7 +5,6 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" } gemspec path: "../" gem "rails", '~>7.0.0' -gem "arel", github: "rails/arel" gem "rake", ">= 11.1" gem "rack-proxy", require: false gem "rspec-rails", "~> 6.0.0" diff --git a/gemfiles/Gemfile-rails.7.1.x b/gemfiles/Gemfile-rails.7.1.x index 22e5fe8ec..cee448a1c 100644 --- a/gemfiles/Gemfile-rails.7.1.x +++ b/gemfiles/Gemfile-rails.7.1.x @@ -5,7 +5,6 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" } gemspec path: "../" gem "rails", '~>7.1.0' -gem "arel", github: "rails/arel" gem "rake", ">= 11.1" gem "rack-proxy", require: false gem "rspec-rails", "~> 6.0.0" diff --git a/gemfiles/Gemfile-rails.7.2.x b/gemfiles/Gemfile-rails.7.2.x index 6b1fce3c8..92c6afd8b 100644 --- a/gemfiles/Gemfile-rails.7.2.x +++ b/gemfiles/Gemfile-rails.7.2.x @@ -5,7 +5,6 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" } gemspec path: "../" gem "rails", '~>7.2.0' -gem "arel", github: "rails/arel" gem "rake", ">= 11.1" gem "rack-proxy", require: false gem "rspec-rails", "~> 6.0.0"