Skip to content

Commit

Permalink
Upgrade ruby and node and remove skipped spec (#875)
Browse files Browse the repository at this point in the history
  • Loading branch information
martikat authored Oct 28, 2024
1 parent b9af967 commit 01b5aef
Show file tree
Hide file tree
Showing 10 changed files with 10 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 3.2.2
ruby-version: 3.3.4

- name: Set up Node
uses: actions/setup-node@v4
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20.11.0
20.18.0
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
4 changes: 2 additions & 2 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
ruby 3.2.2
nodejs 20.11.0
ruby 3.3.4
nodejs 20.18.0
postgres 13.1
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
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source 'https://rubygems.org'

ruby '3.2.2'
ruby '3.3.4'

gem 'puma', '~> 5.6'
gem 'rails', '~> 7.0.8'
Expand Down
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -585,7 +585,7 @@ DEPENDENCIES
yard-junk

RUBY VERSION
ruby 3.2.2p53
ruby 3.3.4p94

BUNDLED WITH
2.4.10
7 changes: 0 additions & 7 deletions spec/system/page_tier_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,6 @@
expect(page).to have_text('Overview')
end

# This currently renders govuk-heading-l for this h2 (does not match styling for third tier page)
xit 'renders h2 as govuk-heading-m' do
within '#communication-and-language-resources' do
expect(page).to include 'govuk-heading-m'
end
end

it 'has a body' do
expect(page.body).to be_present
end
Expand Down
2 changes: 1 addition & 1 deletion uml/application.puml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ rectangle "Help for Early Years Providers" {
rectangle "Sentry" as alert <<service>>
}

note left of app: Ruby 3.2.2 (alpine)
note left of app: Ruby 3.3.4 (alpine)
note bottom of web: Rails v7.0.8

app <-- content: Preview/Delivery
Expand Down

0 comments on commit 01b5aef

Please sign in to comment.