Skip to content

Commit

Permalink
Merge pull request #348 from aspettl/ruby-3.4.2
Browse files Browse the repository at this point in the history
Upgrade to Ruby 3.4.2
  • Loading branch information
aspettl authored Feb 15, 2025
2 parents 13556a9 + a1183f8 commit 258ee59
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ruby-3.4.1
ruby-3.4.2
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM ruby:3.4.1-slim-bookworm AS builder
FROM ruby:3.4.2-slim-bookworm AS builder

RUN apt-get update && apt-get install -y build-essential libmariadb-dev && rm -rf /var/lib/apt/lists/*
RUN apt-get update && apt-get install -y build-essential libmariadb-dev libyaml-dev && rm -rf /var/lib/apt/lists/*

WORKDIR /app

Expand All @@ -18,10 +18,10 @@ COPY . .
RUN RAILS_ENV=production SECRET_KEY_BASE=irrelevant bundle exec rails assets:precompile


FROM ruby:3.4.1-slim-bookworm
FROM ruby:3.4.2-slim-bookworm
LABEL maintainer="[email protected]"

RUN apt-get update && apt-get install -y libmariadb3 && rm -rf /var/lib/apt/lists/*
RUN apt-get update && apt-get install -y libmariadb3 libyaml-0-2 && rm -rf /var/lib/apt/lists/*

WORKDIR /app

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

ruby '3.4.1'
ruby '3.4.2'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails', branch: 'main'
gem 'rails', '~> 8.0.1'
Expand Down
28 changes: 16 additions & 12 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,10 @@ GEM
jbuilder (2.13.0)
actionview (>= 5.0.0)
activesupport (>= 5.0.0)
json (2.9.1)
json (2.10.1)
language_server-protocol (3.17.0.4)
logger (1.6.5)
lint_roller (1.1.0)
logger (1.6.6)
loofah (2.24.0)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
Expand Down Expand Up @@ -229,9 +230,10 @@ GEM
actionpack (>= 5.2)
railties (>= 5.2)
rexml (3.4.0)
rubocop (1.71.2)
rubocop (1.72.1)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
language_server-protocol (~> 3.17.0.2)
lint_roller (~> 1.1.0)
parallel (~> 1.10)
parser (>= 3.3.0.2)
rainbow (>= 2.2.2, < 4.0)
Expand All @@ -241,14 +243,16 @@ GEM
unicode-display_width (>= 2.4.0, < 4.0)
rubocop-ast (1.38.0)
parser (>= 3.3.1.0)
rubocop-minitest (0.36.0)
rubocop (>= 1.61, < 2.0)
rubocop-ast (>= 1.31.1, < 2.0)
rubocop-rails (2.29.1)
rubocop-minitest (0.37.1)
lint_roller (~> 1.1)
rubocop (>= 1.72.1, < 2.0)
rubocop-ast (>= 1.38.0, < 2.0)
rubocop-rails (2.30.0)
activesupport (>= 4.2.0)
lint_roller (~> 1.1)
rack (>= 1.1)
rubocop (>= 1.52.0, < 2.0)
rubocop-ast (>= 1.31.1, < 2.0)
rubocop (>= 1.72.1, < 2.0)
rubocop-ast (>= 1.38.0, < 2.0)
ruby-progressbar (1.13.0)
rubyzip (2.4.1)
sass-rails (6.0.0)
Expand All @@ -275,7 +279,7 @@ GEM
actionpack (>= 6.1)
activesupport (>= 6.1)
sprockets (>= 3.0.0)
stringio (3.1.2)
stringio (3.1.3)
thor (1.3.2)
tilt (2.6.0)
timeout (0.4.3)
Expand Down Expand Up @@ -333,7 +337,7 @@ DEPENDENCIES
web-console (>= 4.1.0)

RUBY VERSION
ruby 3.4.1p0
ruby 3.4.2p28

BUNDLED WITH
2.6.2

0 comments on commit 258ee59

Please sign in to comment.