Skip to content

Commit

Permalink
Ruby 3.4.1
Browse files Browse the repository at this point in the history
  • Loading branch information
neilmiddleton committed Jan 13, 2025
1 parent 640c36c commit 5b11589
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 12 deletions.
6 changes: 3 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ jobs:

ruby-checks:
docker:
- image: "cimg/ruby:3.3.6-node"
- image: "cimg/ruby:3.4.1-node"
steps:
- checkout
- run:
Expand All @@ -145,7 +145,7 @@ jobs:

test:
docker:
- image: cimg/ruby:3.3.6-node
- image: cimg/ruby:3.4.1-node
environment:
BUNDLE_JOBS: "3"
BUNDLE_RETRY: "3"
Expand Down Expand Up @@ -176,7 +176,7 @@ jobs:

notify-production-deployment:
docker:
- image: cimg/ruby:3.3.6
- image: cimg/ruby:3.4.1
steps:
- checkout

Expand Down
2 changes: 1 addition & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ inherit_gem:
require: rubocop-rspec

AllCops:
TargetRubyVersion: 3.3.6
TargetRubyVersion: 3.4.1
Exclude:
- "db/schema.rb"
- "vendor/**/*"
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
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ruby 3.3.6
ruby 3.4.1
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build compilation image
FROM ruby:3.3.6-alpine3.19 as builder
FROM ruby:3.4.1-alpine3.19 as builder

# The application runs from /app
WORKDIR /app
Expand Down Expand Up @@ -43,7 +43,7 @@ RUN rm -rf node_modules log tmp && \
find /usr/local/bundle/gems -name "*.html" -delete

# Build runtime image
FROM ruby:3.3.6-alpine3.19 as production
FROM ruby:3.4.1-alpine3.19 as production

RUN apk add --update --no-cache tzdata postgresql-dev nodejs && \
cp /usr/share/zoneinfo/Europe/London /etc/localtime && \
Expand Down
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ gem 'sidekiq-scheduler'

# Misc
gem 'bootsnap', require: false
gem 'csv'
gem 'nokogiri', '>= 1.10.10'
gem 'sentry-rails'

Expand Down
4 changes: 3 additions & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ GEM
bigdecimal
rexml
crass (1.0.6)
csv (3.3.2)
database_cleaner (2.0.2)
database_cleaner-active_record (>= 2, < 3)
database_cleaner-active_record (2.2.0)
Expand Down Expand Up @@ -784,6 +785,7 @@ DEPENDENCIES
capybara
ci_reporter
ci_reporter_rspec
csv
database_cleaner
dotenv-rails
factory_bot_rails
Expand Down Expand Up @@ -826,7 +828,7 @@ DEPENDENCIES
webpacker

RUBY VERSION
ruby 3.3.6p108
ruby 3.4.1

BUNDLED WITH
2.5.11
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ environment files, see the backend's [README](https://github.com/trade-tariff/tr

> Make sure you install and enable all pre-commit hooks https://pre-commit.com/
* Ruby 3.3.6
* Ruby 3.4.1
* NodeJS
* PostgreSQL

Expand Down
3 changes: 1 addition & 2 deletions config/application.rb
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
require_relative 'boot'

require 'rails/all'
require_relative '../lib/activesupport/basic_object'
require 'rails/all'

# Require the gems listed in Gemfile, including any gems
# you've limited to :test, :development, or :production.
Bundler.require(*Rails.groups)


APP_SLUG = 'trade-tariff-admin'.freeze

module TradeTariffAdmin
Expand Down

0 comments on commit 5b11589

Please sign in to comment.