Merge pull request #4635 from Crown-Commercial-Service/update-ruby-to…

…-v3.3.6 Update ruby version to 3.3.6
Crown-Commercial-Service · Nov 11, 2024 · 504dafe · 504dafe
2 parents cd4d4c9 + 094e0fa
commit 504dafe
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 5 deletions.
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-3.3.5
+3.3.6
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Changed
 
+- Upgrade ruby version to v3.3.6 ([PR 4635](https://github.com/Crown-Commercial-Service/crown-marketplace/pull/4635))
 - Update Node version to LTS version Jod (v22.11.0) ([PR 4623](https://github.com/Crown-Commercial-Service/crown-marketplace/pull/4623))
 - Upgrade CCS Frontend Helpers version to v2.0.0 ([PR 4623](https://github.com/Crown-Commercial-Service/crown-marketplace/pull/4623))
 - Upgrade CCS Frontend version to v1.2.0 ([PR 4623](https://github.com/Crown-Commercial-Service/crown-marketplace/pull/4623))

diff --git a/Dockerfile b/Dockerfile
@@ -5,7 +5,7 @@ ARG ALPINE_VERSION=3.20
 ARG NODE_VERSION=jod
 
 # Set the Ruby version
-ARG RUBY_VERSION=3.3.5
+ARG RUBY_VERSION=3.3.6
 
 # Pull in the NodeJS image
 FROM node:${NODE_VERSION}-alpine${ALPINE_VERSION} AS node

diff --git a/Gemfile b/Gemfile
@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby '3.3.5'
+ruby '3.3.6'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '~> 7.1.5'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -644,6 +644,7 @@ GEM
 PLATFORMS
   x64-mingw32
   x86_64-darwin-22
+  x86_64-darwin-23
   x86_64-linux
   x86_64-linux-musl
 
@@ -730,7 +731,7 @@ DEPENDENCIES
   webmock (>= 3.12.1)
 
 RUBY VERSION
-   ruby 3.3.5p100
+   ruby 3.3.6p108
 
 BUNDLED WITH
    2.4.8
diff --git a/README.md b/README.md
@@ -27,7 +27,7 @@ For any other services relating to the Crown Marketplace, please view [Crown Mar
 This guide assumes you have Homebrew installed
 
 #### Check the Ruby version
-This is a Ruby on Rails application using ruby version `3.3.5`.
+This is a Ruby on Rails application using ruby version `3.3.6`.
 Ensure that, if you are using a ruby environment manager, the correct ruby version is being run in your development environment.
 
 #### Software requirements