Skip to content

Commit

Permalink
Merge pull request #2532 from alphagov/upgrade-ruby
Browse files Browse the repository at this point in the history
Upgrade ruby
  • Loading branch information
callumknights authored Oct 30, 2023
2 parents ded50d7 + 8cc2b5a commit aed0cda
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.1.2
3.2.2
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.1.2
ARG ruby_version=3.2.2
ARG base_image=ghcr.io/alphagov/govuk-ruby-base:$ruby_version
ARG builder_image=ghcr.io/alphagov/govuk-ruby-builder:$ruby_version

Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ gem "govuk_app_config"
gem "govuk_document_types"
gem "govuk_schemas"
gem "govuk_sidekiq"
gem "jsonnet", "~>0.4.0" # 0.5 (current latest) does not currently compile on our CI machines
gem "jsonnet"
gem "json-schema", require: false
gem "oj"
gem "pg"
Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ GEM
json (2.6.3)
json-schema (4.1.1)
addressable (>= 2.8)
jsonnet (0.4.0)
jsonnet (0.5.3)
mini_portile2 (>= 2.2.0)
jwt (2.7.1)
kramdown (2.4.0)
Expand Down Expand Up @@ -782,7 +782,7 @@ DEPENDENCIES
govuk_sidekiq
govuk_test
json-schema
jsonnet (~> 0.4.0)
jsonnet
listen
oj
pact
Expand Down
4 changes: 2 additions & 2 deletions spec/models/access_limit_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
it { is_expected.to be_valid }
end

context "where users has an array with an integer" do
let(:organisations) { [123] }
context "where users has an array with an invalid UUID" do
let(:organisations) { %w[123] }
it { is_expected.to be_invalid }
end
end
Expand Down

0 comments on commit aed0cda

Please sign in to comment.