From ef3eb93622f0418aa1b34f87c4d4d3c5cb604955 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Denquin?= Date: Thu, 12 Dec 2024 16:45:42 +0100 Subject: [PATCH] chore(ruby): Bump ruby & rails version (#2953) --- .github/workflows/migrations-test.yml | 2 +- .github/workflows/spec.yml | 2 +- .ruby-version | 2 +- Dockerfile | 4 +- Dockerfile.dev | 2 +- Gemfile | 6 +- Gemfile.lock | 125 +++++++++++++------------- 7 files changed, 74 insertions(+), 69 deletions(-) diff --git a/.github/workflows/migrations-test.yml b/.github/workflows/migrations-test.yml index f57879f55da..c7a2a003da1 100644 --- a/.github/workflows/migrations-test.yml +++ b/.github/workflows/migrations-test.yml @@ -44,7 +44,7 @@ jobs: - name: Install Ruby and gems uses: ruby/setup-ruby@v1 with: - ruby-version: '3.3.4' + ruby-version: '3.3.6' bundler-cache: true - name: Start Clickhouse database run: | diff --git a/.github/workflows/spec.yml b/.github/workflows/spec.yml index 641a15ebc00..3f8b00f8b83 100644 --- a/.github/workflows/spec.yml +++ b/.github/workflows/spec.yml @@ -51,7 +51,7 @@ jobs: - name: Install Ruby and gems uses: ruby/setup-ruby@v1 with: - ruby-version: '3.3.4' + ruby-version: '3.3.6' bundler-cache: true - name: Start Clickhouse database run: | diff --git a/.ruby-version b/.ruby-version index a0891f563f3..9c25013dbb8 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.3.4 +3.3.6 diff --git a/Dockerfile b/Dockerfile index c9963ebb8be..21b28442739 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:3.3.4-slim AS build +FROM ruby:3.3.6-slim AS build WORKDIR /app @@ -16,7 +16,7 @@ RUN gem install bundler --no-document -v '2.5.5' RUN bundle config build.nokogiri --use-system-libraries &&\ bundle install --jobs=3 --retry=3 --without development test -FROM ruby:3.3.4-slim +FROM ruby:3.3.6-slim WORKDIR /app diff --git a/Dockerfile.dev b/Dockerfile.dev index f4f7af9b60c..dd76930e5c9 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -1,4 +1,4 @@ -FROM ruby:3.3.4-slim +FROM ruby:3.3.6-slim WORKDIR /app diff --git a/Gemfile b/Gemfile index 475758ae5a5..fb99a71058b 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" git_source(:github) { |repo| "https://github.com/#{repo}.git" } -ruby "3.3.4" +ruby "3.3.6" # Core gem "aasm" @@ -11,8 +11,8 @@ gem "activejob-uniqueness", require: "active_job/uniqueness/sidekiq_patch" gem "bootsnap", require: false gem "clockwork", require: false gem "parallel" -gem "puma", "~> 6.4" -gem "rails", "~> 7.1.3.4" +gem "puma", "~> 6.5" +gem "rails", "~> 7.1.5.1" gem "redis" gem "sidekiq" gem "sidekiq-throttled", '1.4.0' # '1.5.0' was losing some jobs diff --git a/Gemfile.lock b/Gemfile.lock index fd48d8d1b7a..4668040a1f2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -37,35 +37,35 @@ GEM specs: aasm (5.5.0) concurrent-ruby (~> 1.0) - actioncable (7.1.3.4) - actionpack (= 7.1.3.4) - activesupport (= 7.1.3.4) + actioncable (7.1.5.1) + actionpack (= 7.1.5.1) + activesupport (= 7.1.5.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) + actionmailbox (7.1.5.1) + actionpack (= 7.1.5.1) + activejob (= 7.1.5.1) + activerecord (= 7.1.5.1) + activestorage (= 7.1.5.1) + activesupport (= 7.1.5.1) 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) + actionmailer (7.1.5.1) + actionpack (= 7.1.5.1) + actionview (= 7.1.5.1) + activejob (= 7.1.5.1) + activesupport (= 7.1.5.1) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp rails-dom-testing (~> 2.2) - actionpack (7.1.3.4) - actionview (= 7.1.3.4) - activesupport (= 7.1.3.4) + actionpack (7.1.5.1) + actionview (= 7.1.5.1) + activesupport (= 7.1.5.1) nokogiri (>= 1.8.5) racc rack (>= 2.2.4) @@ -73,21 +73,21 @@ GEM 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) + actiontext (7.1.5.1) + actionpack (= 7.1.5.1) + activerecord (= 7.1.5.1) + activestorage (= 7.1.5.1) + activesupport (= 7.1.5.1) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.1.3.4) - activesupport (= 7.1.3.4) + actionview (7.1.5.1) + activesupport (= 7.1.5.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.1.5.1) + activesupport (= 7.1.5.1) globalid (>= 0.3.6) activejob-traceable (0.4.2) activejob @@ -95,27 +95,30 @@ GEM activejob-uniqueness (0.3.2) activejob (>= 4.2, < 7.3) redlock (>= 2.0, < 3) - 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.1.5.1) + activesupport (= 7.1.5.1) + activerecord (7.1.5.1) + activemodel (= 7.1.5.1) + activesupport (= 7.1.5.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.1.5.1) + actionpack (= 7.1.5.1) + activejob (= 7.1.5.1) + activerecord (= 7.1.5.1) + activesupport (= 7.1.5.1) marcel (~> 1.0) - activesupport (7.1.3.4) + activesupport (7.1.5.1) base64 + benchmark (>= 0.3) bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) connection_pool (>= 2.2.5) drb i18n (>= 1.6, < 2) + logger (>= 1.4.2) minitest (>= 5.1) mutex_m + securerandom (>= 0.3) tzinfo (~> 2.0) addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) @@ -148,6 +151,7 @@ GEM aws-eventstream (~> 1, >= 1.0.2) base64 (0.2.0) bcrypt (3.1.20) + benchmark (0.4.0) bigdecimal (3.1.8) bootsnap (1.18.4) msgpack (~> 1.2) @@ -186,7 +190,7 @@ GEM activerecord (>= 5.a) database_cleaner-core (~> 2.0.0) database_cleaner-core (2.0.1) - date (3.3.4) + date (3.4.1) debug (1.9.2) irb (~> 1.10) reline (>= 0.3.8) @@ -393,7 +397,7 @@ GEM multipart-post (2.4.1) mutex_m (0.3.0) nenv (0.3.0) - net-imap (0.4.14) + net-imap (0.5.1) date net-protocol net-pop (0.1.2) @@ -403,7 +407,7 @@ GEM net-smtp (0.5.0) net-protocol newrelic_rpm (9.12.0) - nio4r (2.7.3) + nio4r (2.7.4) nokogiri (1.16.8-aarch64-linux) racc (~> 1.4) nokogiri (1.16.8-arm64-darwin) @@ -638,7 +642,7 @@ GEM psych (5.1.2) stringio public_suffix (5.1.1) - puma (6.4.3) + puma (6.5.0) nio4r (~> 2.0) racc (1.8.1) rack (2.2.9) @@ -651,20 +655,20 @@ GEM rackup (1.0.0) rack (< 3) webrick - 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.1.5.1) + actioncable (= 7.1.5.1) + actionmailbox (= 7.1.5.1) + actionmailer (= 7.1.5.1) + actionpack (= 7.1.5.1) + actiontext (= 7.1.5.1) + actionview (= 7.1.5.1) + activejob (= 7.1.5.1) + activemodel (= 7.1.5.1) + activerecord (= 7.1.5.1) + activestorage (= 7.1.5.1) + activesupport (= 7.1.5.1) bundler (>= 1.15.0) - railties (= 7.1.3.4) + railties (= 7.1.5.1) rails-dom-testing (2.2.0) activesupport (>= 5.0.0) minitest @@ -675,9 +679,9 @@ GEM rails-i18n (7.0.9) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 8) - railties (7.1.3.4) - actionpack (= 7.1.3.4) - activesupport (= 7.1.3.4) + railties (7.1.5.1) + actionpack (= 7.1.5.1) + activesupport (= 7.1.5.1) irb rackup (>= 1.0.0) rake (>= 12.2) @@ -800,6 +804,7 @@ GEM scenic (1.8.0) activerecord (>= 4.0.0) railties (>= 4.0.0) + securerandom (0.4.0) sentry-rails (5.18.2) railties (>= 5.0) sentry-ruby (~> 5.18.2) @@ -969,9 +974,9 @@ DEPENDENCIES paper_trail (~> 15.1) parallel pg - puma (~> 6.4) + puma (~> 6.5) rack-cors - rails (~> 7.1.3.4) + rails (~> 7.1.5.1) ransack (~> 4.1.0) redis rspec-graphql_matchers @@ -1005,7 +1010,7 @@ DEPENDENCIES with_advisory_lock RUBY VERSION - ruby 3.3.4p94 + ruby 3.3.6p108 BUNDLED WITH 2.5.5