From 134898c9eabd419124ef4ed2fdad534471c8d6ca Mon Sep 17 00:00:00 2001 From: Yohei Yasukawa Date: Wed, 21 May 2025 23:38:38 +0900 Subject: [PATCH 1/6] Exec: rbenv local 3.4.4 --- .ruby-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ruby-version b/.ruby-version index f092941a..f9892605 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.2.8 +3.4.4 From b22c0374449ad5ae13be90db4462aa80672e4283 Mon Sep 17 00:00:00 2001 From: Yohei Yasukawa Date: Wed, 21 May 2025 23:38:46 +0900 Subject: [PATCH 2/6] Exec 'bundle update' with Ruby 3.4.4 --- Gemfile | 2 +- Gemfile.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 185e9894..510ad3b1 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,5 @@ source 'https://rubygems.org' -ruby '3.2.8' +ruby file: '.ruby-version' gem 'bootsnap' gem 'pg' diff --git a/Gemfile.lock b/Gemfile.lock index 4fcbceed..1de49811 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -590,7 +590,7 @@ DEPENDENCIES web-console RUBY VERSION - ruby 3.2.8p263 + ruby 3.4.4p34 BUNDLED WITH 2.6.9 From a64adf30bb28115e596044e84909264b24625f0b Mon Sep 17 00:00:00 2001 From: Yohei Yasukawa Date: Wed, 21 May 2025 23:38:54 +0900 Subject: [PATCH 3/6] Update Dockerfile with Ruby 3.4.4 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e0fe1808..915fe66a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:3.2.8 +FROM ruby:3.4.4 ENV LANG C.UTF-8 From ed5db33c5b6ffff0e64a6f6c9fb56408971b2dd9 Mon Sep 17 00:00:00 2001 From: Yohei Yasukawa Date: Wed, 21 May 2025 23:49:09 +0900 Subject: [PATCH 4/6] Exec: bundle update --- Gemfile.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 1de49811..b82a03e9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -97,7 +97,7 @@ GEM autoprefixer-rails (10.4.21.0) execjs (~> 2) aws-eventstream (1.3.2) - aws-partitions (1.1105.0) + aws-partitions (1.1106.0) aws-sdk-core (3.224.0) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.992.0) @@ -153,7 +153,7 @@ GEM dotenv-rails (3.1.8) dotenv (= 3.1.8) railties (>= 6.1) - drb (2.2.1) + drb (2.2.3) erb (5.0.1) erubi (1.13.1) execjs (2.10.0) @@ -188,6 +188,7 @@ GEM faraday_middleware (1.2.1) faraday (~> 1.0) ffi (1.17.2) + ffi (1.17.2-arm64-darwin) flamegraph (0.9.5) font-awesome-rails (4.7.0.9) railties (>= 3.2, < 9.0) @@ -268,6 +269,7 @@ GEM railties (>= 6.1) rexml libv8-node (23.6.1.0) + libv8-node (23.6.1.0-arm64-darwin) lint_roller (1.1.0) listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) @@ -286,7 +288,6 @@ GEM memoist (0.16.2) memory_profiler (1.1.0) mini_mime (1.1.5) - mini_portile2 (2.8.9) mini_racer (0.18.1) libv8-node (~> 23.6.1.0) minitest (5.25.5) @@ -306,8 +307,7 @@ GEM net-smtp (0.5.1) net-protocol nio4r (2.7.4) - nokogiri (1.18.8) - mini_portile2 (~> 2.8.2) + nokogiri (1.18.8-arm64-darwin) racc (~> 1.4) observer (0.1.2) os (1.1.4) @@ -367,7 +367,7 @@ GEM actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) activesupport (>= 5.0.1.rc1) - rails-dom-testing (2.2.0) + rails-dom-testing (2.3.0) activesupport (>= 5.0.0) minitest nokogiri (>= 1.6) @@ -532,7 +532,7 @@ GEM zeitwerk (2.7.3) PLATFORMS - ruby + arm64-darwin-21 DEPENDENCIES airbrake From d2a9a9419a9aa0797bf69c6c02eded860c563308 Mon Sep 17 00:00:00 2001 From: Yohei Yasukawa Date: Wed, 21 May 2025 23:49:34 +0900 Subject: [PATCH 5/6] Exec: bundle lock --normalize-platforms cf. https://bundler.io/blog/2024/12/19/bundler-v2-6.html --- Gemfile.lock | 37 +++++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index b82a03e9..1ce061fb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -187,8 +187,14 @@ GEM faraday-retry (1.0.3) faraday_middleware (1.2.1) faraday (~> 1.0) - ffi (1.17.2) + ffi (1.17.2-aarch64-linux-gnu) + ffi (1.17.2-aarch64-linux-musl) + ffi (1.17.2-arm-linux-gnu) + ffi (1.17.2-arm-linux-musl) ffi (1.17.2-arm64-darwin) + ffi (1.17.2-x86_64-darwin) + ffi (1.17.2-x86_64-linux-gnu) + ffi (1.17.2-x86_64-linux-musl) flamegraph (0.9.5) font-awesome-rails (4.7.0.9) railties (>= 3.2, < 9.0) @@ -269,7 +275,11 @@ GEM railties (>= 6.1) rexml libv8-node (23.6.1.0) + libv8-node (23.6.1.0-aarch64-linux) libv8-node (23.6.1.0-arm64-darwin) + libv8-node (23.6.1.0-x86_64-darwin) + libv8-node (23.6.1.0-x86_64-linux) + libv8-node (23.6.1.0-x86_64-linux-musl) lint_roller (1.1.0) listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) @@ -307,8 +317,22 @@ GEM net-smtp (0.5.1) net-protocol nio4r (2.7.4) + nokogiri (1.18.8-aarch64-linux-gnu) + racc (~> 1.4) + nokogiri (1.18.8-aarch64-linux-musl) + racc (~> 1.4) + nokogiri (1.18.8-arm-linux-gnu) + racc (~> 1.4) + nokogiri (1.18.8-arm-linux-musl) + racc (~> 1.4) nokogiri (1.18.8-arm64-darwin) racc (~> 1.4) + nokogiri (1.18.8-x86_64-darwin) + racc (~> 1.4) + nokogiri (1.18.8-x86_64-linux-gnu) + racc (~> 1.4) + nokogiri (1.18.8-x86_64-linux-musl) + racc (~> 1.4) observer (0.1.2) os (1.1.4) ostruct (0.6.1) @@ -532,7 +556,16 @@ GEM zeitwerk (2.7.3) PLATFORMS - arm64-darwin-21 + aarch64-linux + aarch64-linux-gnu + aarch64-linux-musl + arm-linux-gnu + arm-linux-musl + arm64-darwin + x86_64-darwin + x86_64-linux + x86_64-linux-gnu + x86_64-linux-musl DEPENDENCIES airbrake From 79ce923acfc9a754aecbf43d9b21ab35ead42a98 Mon Sep 17 00:00:00 2001 From: Yohei Yasukawa Date: Wed, 21 May 2025 23:56:54 +0900 Subject: [PATCH 6/6] Add bundled gems to Gemfile: csv cf. https://gihyo.jp/article/2024/01/ruby3.3-bundled-gems --- Gemfile | 2 ++ Gemfile.lock | 2 ++ 2 files changed, 4 insertions(+) diff --git a/Gemfile b/Gemfile index 510ad3b1..454281d6 100644 --- a/Gemfile +++ b/Gemfile @@ -18,6 +18,8 @@ gem 'sass-rails', '>= 5' gem 'simple_grid_rails' gem 'uglifier' +gem 'csv' # Need to declare due to become a bundled gem + # Rails 7.1では不要になったため、バージョン制限を解除 gem 'concurrent-ruby' diff --git a/Gemfile.lock b/Gemfile.lock index 1ce061fb..850f5f40 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -146,6 +146,7 @@ GEM concurrent-ruby (1.3.5) connection_pool (2.5.3) crass (1.0.6) + csv (3.3.4) date (3.4.1) declarative (0.0.20) diff-lcs (1.6.2) @@ -575,6 +576,7 @@ DEPENDENCIES capybara coffee-rails concurrent-ruby + csv dotenv-rails factory_bot_rails faraday