From 22b57ed216a9d8489da24b6bb81ae8b3bbe5d66e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Gaya?= Date: Thu, 18 Jan 2024 15:23:08 +0100 Subject: [PATCH 1/2] upgrade Ruby to 3.3.0 --- .ruby-version | 2 +- Gemfile | 2 +- Gemfile.lock | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.ruby-version b/.ruby-version index 0aec50e6e..15a279981 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.1.4 +3.3.0 diff --git a/Gemfile b/Gemfile index 2f7e2ed79..d5ec91353 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source "https://rubygems.org" git_source(:github) { |repo| "https://github.com/#{repo}.git" } -ruby "3.1.4" +ruby "3.3.0" gem "activestorage-scaleway-service"#, path: "../activestorage-scaleway-service" gem "active_storage_validations", "~> 1" diff --git a/Gemfile.lock b/Gemfile.lock index 5d59a6187..06889f19d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -623,6 +623,7 @@ GEM PLATFORMS arm64-darwin-21 arm64-darwin-22 + arm64-darwin-23 x86_64-darwin-21 x86_64-darwin-22 x86_64-linux @@ -711,7 +712,7 @@ DEPENDENCIES webmock RUBY VERSION - ruby 3.1.4p223 + ruby 3.3.0p0 BUNDLED WITH - 2.3.26 + 2.5.4 From db755e764f56867e1a1f3f07d0c955df1542b1fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Gaya?= Date: Thu, 18 Jan 2024 15:26:28 +0100 Subject: [PATCH 2/2] upgrade Ruby and Postgres in CI --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index bf5f7da08..f4a0eae85 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,13 +2,13 @@ version: 2 jobs: build: docker: - - image: cimg/ruby:3.1.4-node + - image: cimg/ruby:3.3.0-node environment: RAILS_ENV: test RACK_ENV: test PGHOST: localhost PGUSER: osuny - - image: cimg/postgres:14.4 + - image: cimg/postgres:14.10 environment: POSTGRES_PASSWORD: "" POSTGRES_USER: osuny