Skip to content

Commit a32a650

Browse files
authored
Update Ruby version from 3.3.4 to 3.4.6 (#674)
- Ruby 3.4.6 includes bug fixes and improvements over 3.3.4 - The net-pop dependency workaround for Ruby 3.3.3 is no longer needed
1 parent 104f07a commit a32a650

File tree

9 files changed

+14
-25
lines changed

9 files changed

+14
-25
lines changed

.controlplane/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile
2-
ARG RUBY_VERSION=3.3.4
2+
ARG RUBY_VERSION=3.4.6
33
FROM registry.docker.com/library/ruby:$RUBY_VERSION-slim as base
44

55
# Current commit hash environment variable
@@ -8,7 +8,7 @@ ENV GIT_COMMIT_SHA=${GIT_COMMIT}
88

99
# Install packages needed to build gems and node modules
1010
RUN apt-get update -qq && \
11-
apt-get install --no-install-recommends -y build-essential curl git libpq-dev libvips node-gyp pkg-config python-is-python3
11+
apt-get install --no-install-recommends -y build-essential curl git libyaml-dev libpq-dev libvips node-gyp pkg-config python-is-python3
1212

1313
# Install JavaScript dependencies
1414
# Make sure NODE_VERSION matches the node version in .nvmrc and package.json

.github/actions/setup-environment/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ runs:
1717
- name: Set up Ruby
1818
uses: ruby/setup-ruby@v1
1919
with:
20-
ruby-version: '3.3.4'
20+
ruby-version: '3.4.6'
2121

2222
- name: Install Control Plane CLI and cpflow gem
2323
shell: bash

.github/workflows/js_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
fail-fast: false
1515
matrix:
1616
node: [22.x]
17-
ruby: [3.3.4]
17+
ruby: [3.4.6]
1818

1919
env:
2020
RAILS_ENV: test

.github/workflows/lint_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
fail-fast: false
1515
matrix:
1616
node: [22.x]
17-
ruby: [3.3.4]
17+
ruby: [3.4.6]
1818

1919
env:
2020
RAILS_ENV: test

.github/workflows/rspec_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
fail-fast: false
1515
matrix:
1616
node: [22.x]
17-
ruby: [3.3.4]
17+
ruby: [3.4.6]
1818

1919
services:
2020
postgres:

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.3.4
1+
3.4.6

Gemfile

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
source "https://rubygems.org"
44
git_source(:github) { |repo| "https://github.com/#{repo}.git" }
55

6-
ruby "3.3.4"
6+
ruby "3.4.6"
77

88
gem "react_on_rails", "16.1.1"
99
gem "shakapacker", "9.0.0.beta.8"
@@ -45,11 +45,6 @@ gem "autoprefixer-rails"
4545

4646
gem "awesome_print"
4747

48-
# Needed until Ruby 3.3.4 is released https://github.com/ruby/ruby/pull/11006
49-
# Related issue: https://github.com/ruby/net-pop/issues/26
50-
# TODO: When Ruby 3.3.4 is released, upgrade Ruby and remove this line
51-
gem "net-pop", github: "ruby/net-pop"
52-
5348
gem "redcarpet"
5449

5550
# jquery as the JavaScript library has been moved under /client and managed by npm.

Gemfile.lock

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
1-
GIT
2-
remote: https://github.com/ruby/net-pop.git
3-
revision: e8d0afe2773b9eb6a23c39e9e437f6fc0fc7c733
4-
specs:
5-
net-pop (0.1.2)
6-
net-protocol
7-
81
GEM
92
remote: https://rubygems.org/
103
specs:
@@ -148,8 +141,6 @@ GEM
148141
factory_bot (~> 6.4)
149142
railties (>= 5.0.0)
150143
ffi (1.17.0)
151-
ffi (1.17.0-arm64-darwin)
152-
ffi (1.17.0-x86_64-linux-gnu)
153144
foreman (0.88.1)
154145
generator_spec (0.10.0)
155146
activesupport (>= 3.0.0)
@@ -195,6 +186,8 @@ GEM
195186
net-imap (0.5.10)
196187
date
197188
net-protocol
189+
net-pop (0.1.2)
190+
net-protocol
198191
net-protocol (0.2.2)
199192
timeout
200193
net-smtp (0.5.1)
@@ -455,9 +448,11 @@ GEM
455448
zeitwerk (2.7.3)
456449

457450
PLATFORMS
451+
arm64-darwin
458452
arm64-darwin-22
459453
ruby
460454
x86_64-linux
455+
x86_64-linux-gnu
461456

462457
DEPENDENCIES
463458
autoprefixer-rails
@@ -474,7 +469,6 @@ DEPENDENCIES
474469
jbuilder
475470
launchy
476471
listen
477-
net-pop!
478472
pg
479473
pry
480474
pry-byebug
@@ -508,7 +502,7 @@ DEPENDENCIES
508502
web-console
509503

510504
RUBY VERSION
511-
ruby 3.3.4p94
505+
ruby 3.4.6p54
512506

513507
BUNDLED WITH
514508
2.4.17

conductor-setup.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ set -e
33

44
echo "🚀 Setting up React on Rails workspace..."
55

6-
# Note: This project requires Ruby 3.3.4.
6+
# Note: This project requires Ruby 3.4.6.
77
# Please ensure you have the correct Ruby version active before running this script.
88

99
# Copy environment files if they exist in the root

0 commit comments

Comments
 (0)