Skip to content

Commit

Permalink
Merge pull request #458 from epimorphics/spike/ruby-rails-node-upgrades
Browse files Browse the repository at this point in the history
Spike/ruby rails node upgrades
  • Loading branch information
bogdanadrianmarc authored Nov 12, 2024
2 parents 6c3d68a + c5c3d9b commit 8b06ff1
Show file tree
Hide file tree
Showing 12 changed files with 403 additions and 333 deletions.
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
lts/fermium
20.12.2
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.8
3.3.5
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Changes to the UKHPI app by version and date

## 2.0.0 - 2024-11

- (Bogdan) Updated all gems by regenerating `Gemfile.lock`
- (Bogdan) Upgraded alpine to `3.20`
- (Bogdan) Upgraded node to `20.12.2`
- (Bogdan) Upgraded rails to `7.2.2`
- (Bogdan) Upgraded ruby to `3.3.5`

## 1.8.0 - 2024-10

- (Dan) Updates ruby version to 2.7.8 and alpine version to 3.16 [GH-455](https://github.com/epimorphics/ukhpi/issues/455)
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ COPY lib lib
COPY public public

# Compile
RUN yarn install --production && RAILS_ENV=production bundle exec rake assets:precompile \
RUN yarn install --production && RAILS_ENV=production NODE_OPTIONS=--openssl-legacy-provider bundle exec rake assets:precompile \
&& mkdir -m 777 /usr/src/app/coverage

# Start a new stage to minimise the final image size
Expand Down
12 changes: 6 additions & 6 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
source 'https://rubygems.org'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 6.0'
gem 'rails'
# Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '>= 1.3.0'

Expand All @@ -24,7 +24,7 @@ gem 'sass-rails'
gem 'govuk_elements_rails'
gem 'govuk_frontend_toolkit', '~> 7.0'
gem 'govuk_template'
gem 'js-routes', '< 2.0'
gem 'js-routes'

gem 'faraday'
gem 'faraday_middleware'
Expand All @@ -35,15 +35,15 @@ gem 'puma'
gem 'puma-metrics'
gem 'rdf-turtle'
gem 'rubocop-rails'
gem 'sentry-rails', '~> 5.7'
gem 'sentry-rails'
gem 'yajl-ruby', require: 'yajl'

group :development, :test do
gem 'byebug'
gem 'haml-lint'
gem 'json_expressions'
gem 'nokogiri', '1.13.10' # This is the highest version that supports Ruby 2.6
gem 'oj', '3.14.2' # This is the highest version that supports Ruby 2.6
gem 'nokogiri'
gem 'oj'
gem 'rubocop', require: false
gem 'tzinfo-data'
end
Expand All @@ -59,7 +59,7 @@ end
group :test do
gem 'capybara_minitest_spec'
gem 'm'
gem 'minitest-rails', '~> 6.0'
gem 'minitest-rails'
gem 'minitest-reporters'
# gem 'minitest-spec-rails'
gem 'mocha'
Expand Down
Loading

0 comments on commit 8b06ff1

Please sign in to comment.