From fa963413c05ec779eb19c586a58f9a689cb74e0d Mon Sep 17 00:00:00 2001 From: Murilo Dal Ri Date: Fri, 9 Feb 2024 15:21:56 +0000 Subject: [PATCH 1/3] Upgrade ruby to 3.3 The #govuk-platform-security-reliability-team expects teams to review, test and deploy this following the steps in the [docs](https://docs.publishing.service.gov.uk/manual/ruby.html#updating-individual-applications) --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7c71c61c8..f85df53bc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG ruby_version=3.2.2 +ARG ruby_version=3.3 ARG base_image=ghcr.io/alphagov/govuk-ruby-base:$ruby_version ARG builder_image=ghcr.io/alphagov/govuk-ruby-builder:$ruby_version From 5a6652efcf7ee983d8159aafad6477403e47fb19 Mon Sep 17 00:00:00 2001 From: Murilo Dal Ri Date: Fri, 9 Feb 2024 15:48:42 +0000 Subject: [PATCH 2/3] Update .ruby-version --- .ruby-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ruby-version b/.ruby-version index be94e6f53..15a279981 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.2.2 +3.3.0 From ab9c739ebee6a46d74e3fc983f8d1270c05881f9 Mon Sep 17 00:00:00 2001 From: Murilo Dal Ri Date: Tue, 13 Feb 2024 15:51:54 +0000 Subject: [PATCH 3/3] Remove incompatible dependencies --- Gemfile.lock | 3 --- 1 file changed, 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index e5bd93c19..866b4934e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -172,9 +172,6 @@ GEM globalid (1.2.1) activesupport (>= 6.1) google-protobuf (3.25.2) - google-protobuf (3.25.2-aarch64-linux) - google-protobuf (3.25.2-arm64-darwin) - google-protobuf (3.25.2-x86_64-linux) googleapis-common-protos-types (1.11.0) google-protobuf (~> 3.18) govspeak (8.3.1)