From d91cc86c05e0d29a9b11edccf28f7a250dc528e1 Mon Sep 17 00:00:00 2001 From: "GOV.UK Continuous Integration User" Date: Fri, 9 Sep 2022 14:31:31 +0100 Subject: [PATCH 1/4] Update .ruby-version to 3.1.2 --- .ruby-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ruby-version b/.ruby-version index 49cdd668e..ef538c281 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.7.6 +3.1.2 From 1475d0e6c3ab293d7e68f7941f1f8e05b9771b28 Mon Sep 17 00:00:00 2001 From: "GOV.UK Continuous Integration User" Date: Fri, 9 Sep 2022 14:31:32 +0100 Subject: [PATCH 2/4] Update Gemfile.lock to 3.1.2 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index e812449d8..e5a677caa 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -393,7 +393,7 @@ DEPENDENCIES webmock RUBY VERSION - ruby 2.7.6p219 + ruby 3.1.2 BUNDLED WITH 2.1.4 From fe5f1e7c7ea6be3fed767780ce1b5cb979e7ed10 Mon Sep 17 00:00:00 2001 From: Aga Dufrat Date: Fri, 9 Sep 2022 16:13:11 +0100 Subject: [PATCH 3/4] Update Dockerfile to 3.1.2 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9e349b4e5..e592032f7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ -ARG base_image=ghcr.io/alphagov/govuk-ruby-base:2.7.6 -ARG builder_image=ghcr.io/alphagov/govuk-ruby-builder:2.7.6 +ARG base_image=ghcr.io/alphagov/govuk-ruby-base:3.1.2 +ARG builder_image=ghcr.io/alphagov/govuk-ruby-builder:3.1.2 FROM $builder_image AS builder From 9ea222c00e0e8de30ff6d913ccbac6b31b9aa2d4 Mon Sep 17 00:00:00 2001 From: Aga Dufrat Date: Fri, 9 Sep 2022 16:13:52 +0100 Subject: [PATCH 4/4] Update bundler To resolve the following deprecation notice following Ruby 3.1 upgrade: Calling DidYouMean::SPELL_CHECKERS.merge!(error_name => spell_checker)' has been deprecated. Please call DidYouMean.correct_error(error_name, spell_checker)' instead. --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index e5a677caa..bc8886948 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -396,4 +396,4 @@ RUBY VERSION ruby 3.1.2 BUNDLED WITH - 2.1.4 + 2.3.22