From 5e8db1dd6cce71cdc65c04ab4dc3729f76255b7b Mon Sep 17 00:00:00 2001 From: Murilo Dal Ri Date: Fri, 9 Feb 2024 15:26:39 +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 a5fc09fc5..a47bc7342 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 05f8431dd57811f85820c1ff55f55cd55a12f492 Mon Sep 17 00:00:00 2001 From: Murilo Dal Ri Date: Fri, 9 Feb 2024 15:50:05 +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 3e2c5b3f8ae63931a8d8a192d0c458113777211d Mon Sep 17 00:00:00 2001 From: Murilo Dal Ri Date: Tue, 13 Feb 2024 15:52:42 +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 a5455c0d1..712a8276f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -227,9 +227,6 @@ GEM google-apis-discovery_v1 (~> 0.5) thor (>= 0.20, < 2.a) 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.12.0) google-protobuf (~> 3.18) googleauth (1.8.1)