Skip to content

Commit

Permalink
Merge pull request #372 from alphagov/ruby34
Browse files Browse the repository at this point in the history
Upgrade Ruby to 3.4
  • Loading branch information
csutter authored Jan 8, 2025
2 parents a8ad015 + 6c375d5 commit b06e327
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 24 deletions.
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.3.6
3.4.1
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG ruby_version=3.3
ARG ruby_version=3.4
ARG base_image=ghcr.io/alphagov/govuk-ruby-base:$ruby_version
ARG builder_image=ghcr.io/alphagov/govuk-ruby-builder:$ruby_version

Expand Down
24 changes: 3 additions & 21 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -108,16 +108,7 @@ GEM
gapic-common (>= 0.24.0, < 2.a)
google-cloud-errors (~> 1.0)
google-logging-utils (0.1.0)
google-protobuf (4.29.2-aarch64-linux)
bigdecimal
rake (>= 13)
google-protobuf (4.29.2-arm64-darwin)
bigdecimal
rake (>= 13)
google-protobuf (4.29.2-x86_64-darwin)
bigdecimal
rake (>= 13)
google-protobuf (4.29.2-x86_64-linux)
google-protobuf (4.29.2)
bigdecimal
rake (>= 13)
googleapis-common-protos (1.6.0)
Expand Down Expand Up @@ -153,16 +144,7 @@ GEM
capybara (>= 3.36)
puma
selenium-webdriver (>= 4.0)
grpc (1.68.1-aarch64-linux)
google-protobuf (>= 3.25, < 5.0)
googleapis-common-protos-types (~> 1.0)
grpc (1.68.1-arm64-darwin)
google-protobuf (>= 3.25, < 5.0)
googleapis-common-protos-types (~> 1.0)
grpc (1.68.1-x86_64-darwin)
google-protobuf (>= 3.25, < 5.0)
googleapis-common-protos-types (~> 1.0)
grpc (1.68.1-x86_64-linux)
grpc (1.68.1)
google-protobuf (>= 3.25, < 5.0)
googleapis-common-protos-types (~> 1.0)
grpc_mock (0.4.6)
Expand Down Expand Up @@ -596,4 +578,4 @@ DEPENDENCIES
timecop

BUNDLED WITH
2.4.10
2.6.2
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
expect(logger).to have_received(:error).with(<<~MSG)
Failed to process incoming document message:
RuntimeError: Could not synchronize
Message content: {:\"I am\"=>\"a message\"}
Message content: {\"I am\": \"a message\"}
MSG
end

Expand Down

0 comments on commit b06e327

Please sign in to comment.