Skip to content

Commit

Permalink
Upgrade to the latest stable Ruby version 3.3.4 (#1266)
Browse files Browse the repository at this point in the history
* Latest stable Ruby version
* Upgrade esbuild directly
* Run Trivy on all package manager changes
* Add extracted CSV gem
  • Loading branch information
peterdavidhamilton authored Jul 18, 2024
1 parent 58842bb commit 0b695d3
Show file tree
Hide file tree
Showing 15 changed files with 129 additions and 112 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/brakeman.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
name: Setup Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 3.2.2
ruby-version: 3.3.4
bundler-cache: true
-
name: Setup Brakeman
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
name: Setup Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 3.2.2
ruby-version: 3.3.4
bundler-cache: true
-
name: Install Rubygems
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cms-search.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
name: Setup Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 3.2.2
ruby-version: 3.3.4
bundler-cache: true
-
name: Install Rubygems
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cms-validate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
name: Setup Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 3.2.2
ruby-version: 3.3.4
bundler-cache: true
-
name: Install Rubygems
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/qa.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
name: Setup Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 3.2.2
ruby-version: 3.3.4
bundler-cache: true
-
name: Install Rubygems
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/trivy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ on:
push:
paths:
- Dockerfile
- Gemfile
- Gemfile.lock
- package.json
- yarn.lock

env:
REGISTRY: ghcr.io/dfe-digital/early-years-foundation-recovery
Expand Down
2 changes: 1 addition & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ inherit_mode:
require: rubocop-performance

AllCops:
TargetRubyVersion: 3.2.2
TargetRubyVersion: 3.3.4

Style/StringLiterals:
EnforcedStyle: single_quotes
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ruby-3.2.2
ruby-3.3.4
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
nodejs 18.11.0
postgres 15.4
ruby 3.2.2
ruby 3.3.4
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# ------------------------------------------------------------------------------
# Base - AMD64 & ARM64 compatible
# ------------------------------------------------------------------------------
FROM ruby:3.2.2-alpine as base
FROM ruby:3.3.4-alpine as base

RUN apk add --no-cache --no-progress --no-check-certificate build-base less curl tzdata gcompat

Expand Down
3 changes: 2 additions & 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.2.2'
ruby '3.3.4'

gem 'pg'
gem 'puma'
Expand Down Expand Up @@ -64,6 +64,7 @@ gem 'grover'
gem 'sitemap_generator'

# Data dashboard feed
gem 'csv'
gem 'google-cloud-storage'

# Background Jobs
Expand Down
6 changes: 4 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ GEM
crass (1.0.6)
cssbundling-rails (1.4.0)
railties (>= 6.0.0)
csv (3.3.0)
date (3.3.4)
debug (1.9.2)
irb (~> 1.10)
Expand Down Expand Up @@ -657,6 +658,7 @@ DEPENDENCIES
capybara
contentful_rails
cssbundling-rails
csv
debug
devise
dibber
Expand Down Expand Up @@ -710,7 +712,7 @@ DEPENDENCIES
yard-junk

RUBY VERSION
ruby 3.2.2p53
ruby 3.3.4p94

BUNDLED WITH
2.4.13
2.5.11
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"accessible-autocomplete": "^3.0.0",
"axios": "^1.7.2",
"dfe-frontend": "^2.0.1",
"esbuild": "^0.21.5",
"esbuild": "^0.23.0",
"govuk-frontend": "^5.3.1",
"puppeteer": "^22.12.0",
"sass": "^1.77.8"
Expand Down
2 changes: 1 addition & 1 deletion spec/jobs/mail_job_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
RSpec.describe MailJob do
describe '.recipients' do
it 'expects a scope to filter users' do
expect { described_class.recipients }.to raise_error NoMethodError, "undefined method `mail_job_recipients' for User:Class"
expect { described_class.recipients }.to raise_error NoMethodError, "undefined method `mail_job_recipients' for class User"
end
end

Expand Down
Loading

0 comments on commit 0b695d3

Please sign in to comment.