Skip to content

Commit 8d3934f

Browse files
authored
Merge pull request #6098 from thejonroberts/ruby-3.3.6
Ruby 3.3.6 update
2 parents 516ab2c + 744c66a commit 8d3934f

File tree

19 files changed

+30
-46
lines changed

19 files changed

+30
-46
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.4, this command
6+
# If the project's required ruby version changes from 3.3.6, this command
77
# will download and compile the correct version, but it will take a long time.
8-
if [ "$RUBY_VERSION" != "3.2.4" ]; then
8+
if [ "$RUBY_VERSION" != "3.3.6" ]; 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.4
1+
3.3.6

.tool-versions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
ruby 3.2.4
1+
ruby 3.3.6
22
yarn 1.22.22
33
nodejs 22.11.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.4-alpine AS builder
1+
FROM ruby:3.3.6-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.4-alpine
17+
FROM ruby:3.3.6-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.4"
5+
ruby "3.3.6"
66
gem "rails", "~> 7.2"
77

88
gem "after_party" # post-deployment tasks

Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -669,7 +669,7 @@ DEPENDENCIES
669669
wicked
670670

671671
RUBY VERSION
672-
ruby 3.2.4p170
672+
ruby 3.3.6p108
673673

674674
BUNDLED WITH
675675
2.5.23

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.4
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.3.6
106106
1. `gem install bundler`
107107

108108
**node.js**

app/services/followup_service.rb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@ def self.create_followup(case_contact, creator, note)
1616
followup
1717
end
1818

19-
private_class_method
20-
21-
def self.send_notification(followup, creator)
19+
private_class_method def self.send_notification(followup, creator)
2220
FollowupNotifier
2321
.with(followup: followup, created_by: creator)
2422
.deliver(followup.case_contact.creator)

app/views/case_contacts/form/details.html.erb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@
5454
</h3>
5555
<% min_date = CaseContact::MINIMUM_DATE %>
5656
<% current_date = Time.zone.today %>
57-
<% initial_value = @case_contact.occurred_at&.to_date %>
5857
<%= form.date_field(:occurred_at,
5958
required: true,
6059
max: (current_date + 1.day).to_fs(:iso8601),

doc/LINUX_SETUP.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ rbenv init
8787
mkdir -p "$(rbenv root)"/plugins
8888
git clone https://github.com/rbenv/ruby-build.git "$(rbenv root)"/plugins/ruby-build
8989
90-
rbenv install 3.2.4
90+
rbenv install 3.3.6
9191
```
9292

9393
If you would like RVM instead of rbenv
@@ -98,9 +98,9 @@ gpg --keyserver hkp://pool.sks-keyservers.net --recv-keys 409B6B1796C275462A1703
9898
\curl -sSL https://get.rvm.io | bash
9999
. ./.bashrc
100100
rvm get head
101-
rvm install 3.2.4
102-
rvm alias create ruby 3.2.4
103-
rvm alias create default ruby-3.2.4
101+
rvm install 3.3.6
102+
rvm alias create ruby 3.3.6
103+
rvm alias create default ruby-3.3.6
104104
```
105105

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

0 commit comments

Comments
 (0)