Skip to content

Commit

Permalink
Update Ruby version to v3.4.1
Browse files Browse the repository at this point in the history
  • Loading branch information
tim-s-ccs committed Jan 13, 2025
1 parent c9ffcf4 commit 78fb3ae
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ require:

AllCops:
NewCops: enable
TargetRubyVersion: 3.3
TargetRubyVersion: 3.4
Exclude:
- 'db/schema.rb'
- 'db/seeds.rb'
Expand Down
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## Changed

- Upgrade ruby version to v3.4.1 ([PR 4690](https://github.com/Crown-Commercial-Service/crown-marketplace/pull/4690))
- Upgrade alpine version to v3.21 ([PR 4690](https://github.com/Crown-Commercial-Service/crown-marketplace/pull/4690))
- Upgrade CCS Frontend Helpers version to v2.1.0 ([PR 4688](https://github.com/Crown-Commercial-Service/crown-marketplace/pull/4688))
- Upgrade CCS Frontend version to v1.3.2 ([PR 4684](https://github.com/Crown-Commercial-Service/crown-marketplace/pull/4684))
- 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))
Expand Down
10 changes: 7 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
# Set the alpine version so they match for both images
ARG ALPINE_VERSION=3.20
ARG ALPINE_VERSION=3.21

# Set the NodeJS version
ARG NODE_VERSION=jod

# Set the Ruby version
ARG RUBY_VERSION=3.3.6
ARG RUBY_VERSION=3.4.1

# Pull in the NodeJS image
FROM node:${NODE_VERSION}-alpine${ALPINE_VERSION} AS node

# Remove yarn as we already have it downloaded in the app
RUN rm /usr/local/bin/yarn && \
rm /usr/local/bin/yarnpkg

# Pull in the Ruby image
FROM ruby:${RUBY_VERSION}-alpine${ALPINE_VERSION} AS base

Expand Down Expand Up @@ -54,14 +58,14 @@ FROM base AS build
# to our current ruby build image stage
# so that the ruby image build stage has the correct nodejs version
COPY --from=node /usr/local/bin /usr/local/bin
COPY --from=node /usr/local/lib /usr/local/lib

# Install application dependencies
RUN apk add --update --no-cache \
build-base \
curl \
git \
libpq-dev \
npm \
tzdata

# Enable corepack for yarn
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby '3.3.6'
ruby '3.4.1'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 7.1.5'
Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ GEM
cssbundling-rails (1.4.1)
railties (>= 6.0.0)
csv (3.3.0)
cucumber (9.2.0)
cucumber (9.2.1)
builder (~> 3.2)
cucumber-ci-environment (> 9, < 11)
cucumber-core (> 13, < 14)
Expand Down Expand Up @@ -747,7 +747,7 @@ DEPENDENCIES
webmock (>= 3.12.1)

RUBY VERSION
ruby 3.3.6p108
ruby 3.4.1p0

BUNDLED WITH
2.4.8
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.6`.
This is a Ruby on Rails application using ruby version `3.4.1`.
Ensure that, if you are using a ruby environment manager, the correct ruby version is being run in your development environment.

#### Software requirements
Expand Down

0 comments on commit 78fb3ae

Please sign in to comment.