diff --git a/.ruby-version b/.ruby-version index 4f5e69734..2aa513199 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.4.5 +3.4.7 diff --git a/Dockerfile b/Dockerfile index 84b823e1f..03599b765 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:3.4.5 +FROM ruby:3.4.7 # Default node version on apt is old. This makes sure a recent version is installed # This step also runs apt-get update diff --git a/Gemfile b/Gemfile index b1094586f..9cd171144 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,5 @@ source 'https://rubygems.org' -ruby '3.4.5' +ruby file: '.ruby-version' gem 'rails', '~> 7.1.5.1' # LOCKED: It is Rails. # The original asset pipeline for Rails [https://github.com/rails/sprockets-rails] diff --git a/Gemfile.lock b/Gemfile.lock index 82ca83fe3..fe46d37be 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -591,6 +591,7 @@ GEM PLATFORMS aarch64-linux arm64-darwin-20 + arm64-darwin-25 x86_64-darwin-24 x86_64-linux @@ -681,7 +682,7 @@ DEPENDENCIES web-console (>= 4.1.0) RUBY VERSION - ruby 3.4.5p51 + ruby 3.4.7p58 BUNDLED WITH - 2.6.7 + 2.7.2 diff --git a/native-installation-instructions.md b/native-installation-instructions.md index 170e7c293..2112065b1 100644 --- a/native-installation-instructions.md +++ b/native-installation-instructions.md @@ -16,20 +16,20 @@ These are the original instructions for natively installing the app to your mach ## Set up a Ruby Environment -You will need to install Ruby 3.4.5 using RVM or rbenv. +You will need to install Ruby 3.4.7 using RVM or rbenv. ### Option 1: Using [rvm](https://rvm.io/rvm/install) ```bash -CPPFLAGS=-DUSE_FFI_CLOSURE_ALLOC rvm install 3.4.5 +CPPFLAGS=-DUSE_FFI_CLOSURE_ALLOC rvm install 3.4.7 ``` -We need to set the CPPFLAGS env variable to be able to install Ruby 3.4.5 on M1 Mac machines. See more: [https://github.com/ffi/ffi/issues/869#issuecomment-1233000037](https://github.com/ffi/ffi/issues/869#issuecomment-1233000037) +We need to set the CPPFLAGS env variable to be able to install Ruby 3.4.7 on M1 Mac machines. See more: [https://github.com/ffi/ffi/issues/869#issuecomment-1233000037](https://github.com/ffi/ffi/issues/869#issuecomment-1233000037) ### Option 2: Using [rbenv](https://github.com/sstephenson/rbenv) and [ruby-build](https://github.com/sstephenson/ruby-build) ```bash -rbenv install 3.4.5 -rbenv global 3.4.5 +rbenv install 3.4.7 +rbenv global 3.4.7 ``` ## Install and run PostgreSQL