Skip to content

Commit 47112aa

Browse files
authored
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
2 parents b9c9d67 + 5fb3457 commit 47112aa

File tree

11 files changed

+24
-24
lines changed

11 files changed

+24
-24
lines changed

.devcontainer/post-create.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ RUBY_VERSION="$(cat .ruby-version | tr -d '\n')"
33
# copy the file only if it doesn't already exist
44
cp -n .devcontainer/.env.codespaces .env
55

6-
# If the project's required ruby version changes from 3.2.2, this command
6+
# If the project's required ruby version changes from 3.2.4, this command
77
# will download and compile the correct version, but it will take a long time.
8-
if [ "$RUBY_VERSION" != "3.2.2" ]; then
8+
if [ "$RUBY_VERSION" != "3.2.4" ]; then
99
rvm install $RUBY_VERSION
1010
rvm use $RUBY_VERSION
1111
echo "Ruby $RUBY_VERSION installed"

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.2.2
1+
3.2.4

.tool-versions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
ruby 3.2.2
1+
ruby 3.2.4
22
yarn 1.22.19
33
nodejs 20.16.0

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ruby:3.2.2-alpine AS builder
1+
FROM ruby:3.2.4-alpine AS builder
22

33
RUN apk update && apk upgrade && apk add --update --no-cache \
44
build-base \
@@ -14,7 +14,7 @@ RUN bundle install
1414

1515
### BUILD STEP DONE ###
1616

17-
FROM ruby:3.2.2-alpine
17+
FROM ruby:3.2.4-alpine
1818

1919
ARG RAILS_ROOT=/usr/src/app/
2020

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
source "https://rubygems.org"
44

5-
ruby "3.2.2"
5+
ruby "3.2.4"
66
gem "rails", "7.2.1"
77

88
gem "after_party" # post-deployment tasks

Gemfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -669,7 +669,7 @@ DEPENDENCIES
669669
wicked
670670

671671
RUBY VERSION
672-
ruby 3.2.2p53
672+
ruby 3.2.4p170
673673

674674
BUNDLED WITH
675-
2.5.17
675+
2.5.22

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ The complete [role description of a CASA volunteer](https://pgcasa.org/volunteer
102102

103103
**Ruby**
104104
1. Install a ruby version manager: [rvm](https://rvm.io/) or [rbenv](https://github.com/rbenv/rbenv)
105-
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
105+
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
106106
1. `gem install bundler`
107107

108108
**node.js**

doc/LINUX_SETUP.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ rbenv init
8282
mkdir -p "$(rbenv root)"/plugins
8383
git clone https://github.com/rbenv/ruby-build.git "$(rbenv root)"/plugins/ruby-build
8484
85-
rbenv install 3.2.2
85+
rbenv install 3.2.4
8686
```
8787

8888
If you would like RVM instead of rbenv
@@ -93,9 +93,9 @@ gpg --keyserver hkp://pool.sks-keyservers.net --recv-keys 409B6B1796C275462A1703
9393
\curl -sSL https://get.rvm.io | bash
9494
. ./.bashrc
9595
rvm get head
96-
rvm install 3.2.2
97-
rvm alias create ruby 3.2.2
98-
rvm alias create default ruby-3.2.2
96+
rvm install 3.2.4
97+
rvm alias create ruby 3.2.4
98+
rvm alias create default ruby-3.2.4
9999
```
100100

101101
```# Download the Chrome browser (for RSpec testing):

doc/MAC_SETUP.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,17 +53,17 @@ Next, install the version of Ruby that this project uses. This can be found by c
5353
To install the appropriate ruby version, run:
5454

5555
```bash
56-
rbenv install 3.2.2
56+
rbenv install 3.2.4
5757
```
5858

59-
(Do not forget to switch 3.2.2 to the appropriate version)
59+
(Do not forget to switch 3.2.4 to the appropriate version)
6060

6161
Finally, run:
6262

6363
```bash
64-
rbenv local 3.2.2
64+
rbenv local 3.2.4
6565
```
66-
(Do not forget to swtich 3.2.2 to the appropriate version)
66+
(Do not forget to swtich 3.2.4 to the appropriate version)
6767

6868
## Nodejs
6969

doc/WSL_SETUP.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ You will need the following local tools installed:
2828

2929
Install a ruby version manager like [rbenv](https://github.com/rbenv/rbenv#installation)
3030

31-
**Be sure to install the ruby version in `.ruby-version`. Right now that's Ruby 3.2.2.**
31+
**Be sure to install the ruby version in `.ruby-version`. Right now that's Ruby 3.2.4.**
3232

3333
Instructions for rbenv:
3434

@@ -48,13 +48,13 @@ Instructions for rbenv:
4848

4949
5. **[Install Ruby](https://github.com/rbenv/rbenv#installing-ruby-versions)**
5050

51-
**Be sure to install the ruby version in `.ruby-version`. Right now that's Ruby 3.2.2.**
51+
**Be sure to install the ruby version in `.ruby-version`. Right now that's Ruby 3.2.4.**
5252

53-
`rbenv install 3.2.2`
53+
`rbenv install 3.2.4`
5454

5555
6. **Set a Ruby version to finish installation and start**
5656

57-
`rbenv global 3.2.2` OR `rbenv local 3.2.2`
57+
`rbenv global 3.2.4` OR `rbenv local 3.2.4`
5858

5959
#### Troubleshooting
6060
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.
206206

207207
See [Running the App / Verifying Installation](https://github.com/rubyforgood/casa#running-the-app--verifying-installation).
208208

209-
A good option for editing files in WSL is [Visual Studio Code Remote- WSL](https://code.visualstudio.com/docs/remote/wsl)
209+
A good option for editing files in WSL is [Visual Studio Code Remote- WSL](https://code.visualstudio.com/docs/remote/wsl)

0 commit comments

Comments
 (0)