From ad29cdb255fac176ffe655828f859ad716f2ab69 Mon Sep 17 00:00:00 2001 From: Bruce Bolt Date: Mon, 26 Feb 2024 10:54:57 +0000 Subject: [PATCH 1/3] Bump `google-protobuf` to 3.25.3 Version 3.25.2 is not compatible with Ruby 3.3, so we need to upgrade this dependency before upgrading Ruby. --- Gemfile.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 4880e3088..7058bcb2e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -151,10 +151,10 @@ GEM rest-client (~> 2.0) 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) + google-protobuf (3.25.3) + google-protobuf (3.25.3-aarch64-linux) + google-protobuf (3.25.3-arm64-darwin) + google-protobuf (3.25.3-x86_64-linux) googleapis-common-protos-types (1.11.0) google-protobuf (~> 3.18) govuk_app_config (9.8.2) @@ -739,4 +739,4 @@ DEPENDENCIES whenever BUNDLED WITH - 2.4.10 + 2.5.3 From bd4fbfa841464ba7a349ccb7aebbdce1023badc8 Mon Sep 17 00:00:00 2001 From: Murilo Dal Ri Date: Fri, 9 Feb 2024 15:25:09 +0000 Subject: [PATCH 2/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 b994fb740..5ca3a2102 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 1dc839d08782dd4e8118eeba3828c1ac373c0e8f Mon Sep 17 00:00:00 2001 From: Murilo Dal Ri Date: Fri, 9 Feb 2024 15:49:26 +0000 Subject: [PATCH 3/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