Skip to content

Commit

Permalink
Ruby 3.2.6に更新 (#1933)
Browse files Browse the repository at this point in the history
* update Ruby to 3.2.6

* update yarn.lock

* use sass-rails 2.1.0

* use sassc 2.1.0

* update package.json

* disable css compression

* update Gemfile.lock

* update Gemfile.lock

* update package.json
  • Loading branch information
nabeta authored Jan 13, 2025
1 parent 6408441 commit 5111553
Show file tree
Hide file tree
Showing 7 changed files with 617 additions and 482 deletions.
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.2.5
3.2.6
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# syntax = docker/dockerfile:1

# Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile
ARG RUBY_VERSION=3.2.5
ARG RUBY_VERSION=3.2.6
FROM registry.docker.com/library/ruby:$RUBY_VERSION-slim as base

Check warning on line 5 in Dockerfile

View workflow job for this annotation

GitHub Actions / build

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

# Rails app lives here
Expand Down
2 changes: 1 addition & 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.5"
ruby "3.2.6"

# Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
gem "rails", "~> 7.1.3", ">= 7.1.3.4"
Expand Down
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -604,7 +604,7 @@ DEPENDENCIES
webpacker (~> 5.0)

RUBY VERSION
ruby 3.2.5p208
ruby 3.2.6p234

BUNDLED WITH
2.4.19
1 change: 1 addition & 0 deletions config/environments/production.rb
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@

# Compress CSS using a preprocessor.
# config.assets.css_compressor = :sass
config.assets.css_compressor = nil

# Do not fall back to assets pipeline if a precompiled asset is missed.
config.assets.compile = false
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
"dependencies": {
"@babel/runtime": "^7.25.0",
"@mui/system": "^5.16.7",
"@rails/actioncable": "~7.1.3",
"@rails/actioncable": "~7.1.5",
"@rails/webpacker": "5.4.4",
"dnd-core": "^16.0.1",
"mirador": "^4.0.0-alpha.4",
"mirador": "^4.0.0-alpha.5",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"webpack": "^4.46.0",
Expand Down
1,086 changes: 610 additions & 476 deletions yarn.lock

Large diffs are not rendered by default.

0 comments on commit 5111553

Please sign in to comment.