Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .controlplane/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile
ARG RUBY_VERSION=3.3.4
ARG RUBY_VERSION=3.4.6
FROM registry.docker.com/library/ruby:$RUBY_VERSION-slim as base

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

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

# Install JavaScript dependencies
# Make sure NODE_VERSION matches the node version in .nvmrc and package.json
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/setup-environment/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ runs:
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: '3.3.4'
ruby-version: '3.4.6'

- name: Install Control Plane CLI and cpflow gem
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/js_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
fail-fast: false
matrix:
node: [22.x]
ruby: [3.3.4]
ruby: [3.4.6]

env:
RAILS_ENV: test
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
fail-fast: false
matrix:
node: [22.x]
ruby: [3.3.4]
ruby: [3.4.6]

env:
RAILS_ENV: test
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rspec_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
fail-fast: false
matrix:
node: [22.x]
ruby: [3.3.4]
ruby: [3.4.6]

services:
postgres:
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.3.4
3.4.6
6 changes: 3 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
source "https://rubygems.org"
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby "3.3.4"
ruby "3.4.6"

gem "react_on_rails", "16.1.1"
gem "shakapacker", "9.0.0.beta.8"
Expand Down Expand Up @@ -45,9 +45,9 @@ gem "autoprefixer-rails"

gem "awesome_print"

# Needed until Ruby 3.3.4 is released https://github.com/ruby/ruby/pull/11006
# Needed until Ruby 3.4.6 is released https://github.com/ruby/ruby/pull/11006
# Related issue: https://github.com/ruby/net-pop/issues/26
# TODO: When Ruby 3.3.4 is released, upgrade Ruby and remove this line
# TODO: When Ruby 3.4.6 is released, upgrade Ruby and remove this line
gem "net-pop", github: "ruby/net-pop"

gem "redcarpet"
Expand Down
6 changes: 3 additions & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,6 @@ GEM
factory_bot (~> 6.4)
railties (>= 5.0.0)
ffi (1.17.0)
ffi (1.17.0-arm64-darwin)
ffi (1.17.0-x86_64-linux-gnu)
foreman (0.88.1)
generator_spec (0.10.0)
activesupport (>= 3.0.0)
Expand Down Expand Up @@ -455,9 +453,11 @@ GEM
zeitwerk (2.7.3)

PLATFORMS
arm64-darwin
arm64-darwin-22
ruby
x86_64-linux
x86_64-linux-gnu

DEPENDENCIES
autoprefixer-rails
Expand Down Expand Up @@ -508,7 +508,7 @@ DEPENDENCIES
web-console

RUBY VERSION
ruby 3.3.4p94
ruby 3.4.6p54

BUNDLED WITH
2.4.17
2 changes: 1 addition & 1 deletion conductor-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ set -e

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

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

# Copy environment files if they exist in the root
Expand Down