Merge pull request #6085 from rubyforgood/upgrade-from-ruby-3.2.2-to-…

…3.2.4 Upgrade from ruby 3.2.2 to 3.2.4
rubyforgood · Oct 23, 2024 · 47112aa · 47112aa
2 parents b9c9d67 + 5fb3457
commit 47112aa
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 24 deletions.
diff --git a/.devcontainer/post-create.sh b/.devcontainer/post-create.sh
@@ -3,9 +3,9 @@ RUBY_VERSION="$(cat .ruby-version | tr -d '\n')"
 # copy the file only if it doesn't already exist
 cp -n .devcontainer/.env.codespaces .env
 
-# If the project's required ruby version changes from 3.2.2, this command
+# If the project's required ruby version changes from 3.2.4, this command
 # will download and compile the correct version, but it will take a long time.
-if [ "$RUBY_VERSION" != "3.2.2" ]; then
+if [ "$RUBY_VERSION" != "3.2.4" ]; then
 	rvm install $RUBY_VERSION
 	rvm use $RUBY_VERSION
 	echo "Ruby $RUBY_VERSION installed"

diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-3.2.2
+3.2.4
diff --git a/.tool-versions b/.tool-versions
@@ -1,3 +1,3 @@
-ruby 3.2.2
+ruby 3.2.4
 yarn 1.22.19
 nodejs 20.16.0
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:3.2.2-alpine AS builder
+FROM ruby:3.2.4-alpine AS builder
 
 RUN apk update && apk upgrade && apk add --update --no-cache \
   build-base \
@@ -14,7 +14,7 @@ RUN bundle install
 
 ### BUILD STEP DONE ###
 
-FROM ruby:3.2.2-alpine
+FROM ruby:3.2.4-alpine
 
 ARG RAILS_ROOT=/usr/src/app/
 

diff --git a/Gemfile b/Gemfile
@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-ruby "3.2.2"
+ruby "3.2.4"
 gem "rails", "7.2.1"
 
 gem "after_party" # post-deployment tasks

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -669,7 +669,7 @@ DEPENDENCIES
   wicked
 
 RUBY VERSION
-   ruby 3.2.2p53
+   ruby 3.2.4p170
 
 BUNDLED WITH
-   2.5.17
+   2.5.22
diff --git a/README.md b/README.md
@@ -102,7 +102,7 @@ The complete [role description of a CASA volunteer](https://pgcasa.org/volunteer
 
 **Ruby**
 1. Install a ruby version manager: [rvm](https://rvm.io/) or [rbenv](https://github.com/rbenv/rbenv)
-1. when you cd into the project directory, let your version manager install the ruby version in `.ruby-version`. Right now that's Ruby 3.2.2
+1. when you cd into the project directory, let your version manager install the ruby version in `.ruby-version`. Right now that's Ruby 3.2.4
 1. `gem install bundler`
 
 **node.js**

diff --git a/doc/LINUX_SETUP.md b/doc/LINUX_SETUP.md
@@ -82,7 +82,7 @@ rbenv init
 mkdir -p "$(rbenv root)"/plugins
 git clone https://github.com/rbenv/ruby-build.git "$(rbenv root)"/plugins/ruby-build
 
-rbenv install 3.2.2
+rbenv install 3.2.4
 ```
 
 If you would like RVM instead of rbenv
@@ -93,9 +93,9 @@ gpg --keyserver hkp://pool.sks-keyservers.net --recv-keys 409B6B1796C275462A1703
 \curl -sSL https://get.rvm.io | bash
 . ./.bashrc
 rvm get head
-rvm install 3.2.2
-rvm alias create ruby 3.2.2
-rvm alias create default ruby-3.2.2
+rvm install 3.2.4
+rvm alias create ruby 3.2.4
+rvm alias create default ruby-3.2.4
 ```
 
 ```# Download the Chrome browser (for RSpec testing):

diff --git a/doc/MAC_SETUP.md b/doc/MAC_SETUP.md
@@ -53,17 +53,17 @@ Next, install the version of Ruby that this project uses. This can be found by c
 To install the appropriate ruby version, run:
 
 ```bash
-rbenv install 3.2.2
+rbenv install 3.2.4
 ```
 
-(Do not forget to switch 3.2.2 to the appropriate version)
+(Do not forget to switch 3.2.4 to the appropriate version)
 
 Finally, run:
 
 ```bash
-rbenv local 3.2.2
+rbenv local 3.2.4
 ```
-(Do not forget to swtich 3.2.2 to the appropriate version)
+(Do not forget to swtich 3.2.4 to the appropriate version)
 
 ## Nodejs
 

diff --git a/doc/WSL_SETUP.md b/doc/WSL_SETUP.md
@@ -28,7 +28,7 @@ You will need the following local tools installed:
 
 Install a ruby version manager like [rbenv](https://github.com/rbenv/rbenv#installation)
 
-  **Be sure to install the ruby version in `.ruby-version`. Right now that's Ruby 3.2.2.**
+  **Be sure to install the ruby version in `.ruby-version`. Right now that's Ruby 3.2.4.**
 
 Instructions for rbenv:
 
@@ -48,13 +48,13 @@ Instructions for rbenv:
 
 5.  **[Install Ruby](https://github.com/rbenv/rbenv#installing-ruby-versions)**
 
-      **Be sure to install the ruby version in `.ruby-version`. Right now that's Ruby 3.2.2.**
+      **Be sure to install the ruby version in `.ruby-version`. Right now that's Ruby 3.2.4.**
 
-      `rbenv install 3.2.2`
+      `rbenv install 3.2.4`
 
 6. **Set a Ruby version to finish installation and start**
 
-    `rbenv global 3.2.2` OR `rbenv local 3.2.2`
+    `rbenv global 3.2.4` OR `rbenv local 3.2.4`
 
 #### Troubleshooting
     If you are on Ubuntu in Windows Subsystem for Linux (WSL) and `rbenv install` indicates that the Ruby version is unavailable, you might be using Ubuntu's default install of `ruby-build`, which only comes with old installs of Ruby (ending before 2.6.) You should uninstall rvm and ruby-build's apt packages (`apt remove rvm ruby-build`) and install them with Git like this:
@@ -206,4 +206,4 @@ Casa's install will also install the correct version of Rails.
 
 See [Running the App / Verifying Installation](https://github.com/rubyforgood/casa#running-the-app--verifying-installation).
 
-A good option for editing files in WSL is [Visual Studio Code Remote- WSL](https://code.visualstudio.com/docs/remote/wsl)
+A good option for editing files in WSL is [Visual Studio Code Remote- WSL](https://code.visualstudio.com/docs/remote/wsl)
diff --git a/flake.nix b/flake.nix
@@ -39,7 +39,7 @@
 
         gemConfig = { };
         # See available versions here: https://github.com/bobvanderlinden/nixpkgs-ruby/blob/master/ruby/versions.json
-        ruby = pkgs."ruby-3.2.2";
+        ruby = pkgs."ruby-3.2.4";
 
         bundixcli = bundix.packages.${system}.default;
       in rec {