From bad2b7625f13d47cac1492b778bb4c2fe0bf2da2 Mon Sep 17 00:00:00 2001 From: Bruce Bolt Date: Thu, 21 Nov 2024 16:42:52 +0000 Subject: [PATCH 1/2] Update ruby to version 3.3.6 --- .ruby-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ruby-version b/.ruby-version index bea438e9a..9c25013db 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.3.1 +3.3.6 From ddb268d97e6777424c208450200cd94be2015bc4 Mon Sep 17 00:00:00 2001 From: Bruce Bolt Date: Thu, 21 Nov 2024 16:48:38 +0000 Subject: [PATCH 2/2] Run `bundle update` after Ruby upgrade --- Gemfile.lock | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index c99b62b1b..0571dfcae 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -180,10 +180,10 @@ GEM rake (>= 13) googleapis-common-protos-types (1.16.0) google-protobuf (>= 3.18, < 5.a) - govuk_app_config (9.15.1) + govuk_app_config (9.15.2) logstasher (~> 2.1) opentelemetry-exporter-otlp (>= 0.25, < 0.30) - opentelemetry-instrumentation-all (>= 0.39.1, < 0.69.0) + opentelemetry-instrumentation-all (>= 0.39.1, < 0.70.0) opentelemetry-sdk (~> 1.2) plek (>= 4, < 6) prometheus_exporter (~> 2.0) @@ -195,7 +195,7 @@ GEM govuk_personalisation (1.1.0) plek (>= 1.9.0) rails (>= 6, < 9) - govuk_publishing_components (45.6.0) + govuk_publishing_components (45.6.1) chartkick govuk_app_config govuk_personalisation (>= 0.7.0) @@ -295,7 +295,7 @@ GEM mime-types-data (3.2024.1105) mini_mime (1.1.5) mini_portile2 (2.8.8) - minitest (5.25.1) + minitest (5.25.2) mocha (2.5.0) ruby2_keywords (>= 0.0.5) msgpack (1.7.5) @@ -343,7 +343,7 @@ GEM opentelemetry-api (~> 1.0) opentelemetry-instrumentation-active_support (~> 0.1) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-action_pack (0.9.0) + opentelemetry-instrumentation-action_pack (0.10.0) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) opentelemetry-instrumentation-rack (~> 0.21) @@ -357,13 +357,13 @@ GEM opentelemetry-instrumentation-active_model_serializers (0.20.2) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-active_record (0.8.0) + opentelemetry-instrumentation-active_record (0.8.1) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) opentelemetry-instrumentation-active_support (0.6.0) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-all (0.68.0) + opentelemetry-instrumentation-all (0.69.0) opentelemetry-instrumentation-active_model_serializers (~> 0.20.1) opentelemetry-instrumentation-aws_lambda (~> 0.1.0) opentelemetry-instrumentation-aws_sdk (~> 0.7.0) @@ -388,7 +388,7 @@ GEM opentelemetry-instrumentation-que (~> 0.8.0) opentelemetry-instrumentation-racecar (~> 0.3.0) opentelemetry-instrumentation-rack (~> 0.25.0) - opentelemetry-instrumentation-rails (~> 0.32.0) + opentelemetry-instrumentation-rails (~> 0.33.0) opentelemetry-instrumentation-rake (~> 0.2.1) opentelemetry-instrumentation-rdkafka (~> 0.4.0) opentelemetry-instrumentation-redis (~> 0.25.1) @@ -475,10 +475,10 @@ GEM opentelemetry-instrumentation-rack (0.25.0) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-rails (0.32.0) + opentelemetry-instrumentation-rails (0.33.0) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-action_mailer (~> 0.2.0) - opentelemetry-instrumentation-action_pack (~> 0.9.0) + opentelemetry-instrumentation-action_pack (~> 0.10.0) opentelemetry-instrumentation-action_view (~> 0.7.0) opentelemetry-instrumentation-active_job (~> 0.7.0) opentelemetry-instrumentation-active_record (~> 0.8.0) @@ -791,4 +791,4 @@ DEPENDENCIES webmock BUNDLED WITH - 2.4.10 + 2.5.23